andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Pins cleanup

pull/1/head
Scott Lahteine 5 years ago
parent
42be684e69
commit
179095c387
39 changed files with 123 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      Marlin/src/pins/linux/pins_RAMPS_LINUX.h
  2. 4
      Marlin/src/pins/mega/pins_MEGACONTROLLER.h
  3. 6
      Marlin/src/pins/mega/pins_MEGATRONICS.h
  4. 4
      Marlin/src/pins/mega/pins_MEGATRONICS_2.h
  5. 8
      Marlin/src/pins/mega/pins_MEGATRONICS_3.h
  6. 4
      Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
  7. 4
      Marlin/src/pins/rambo/pins_EINSY_RETRO.h
  8. 4
      Marlin/src/pins/rambo/pins_MINIRAMBO.h
  9. 4
      Marlin/src/pins/rambo/pins_RAMBO.h
  10. 8
      Marlin/src/pins/ramps/pins_3DRAG.h
  11. 4
      Marlin/src/pins/ramps/pins_AZTEEG_X3.h
  12. 9
      Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
  13. 4
      Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
  14. 6
      Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
  15. 4
      Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
  16. 12
      Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
  17. 4
      Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
  18. 8
      Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
  19. 4
      Marlin/src/pins/ramps/pins_MKS_BASE.h
  20. 18
      Marlin/src/pins/ramps/pins_RAMPS.h
  21. 10
      Marlin/src/pins/ramps/pins_RAMPS_OLD.h
  22. 4
      Marlin/src/pins/ramps/pins_RUMBA.h
  23. 4
      Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
  24. 4
      Marlin/src/pins/ramps/pins_ULTIMAKER.h
  25. 8
      Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
  26. 12
      Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
  27. 4
      Marlin/src/pins/sam/pins_RAMPS_DUO.h
  28. 2
      Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
  29. 4
      Marlin/src/pins/sam/pins_RAMPS_SMART.h
  30. 6
      Marlin/src/pins/sanguino/pins_GEN6.h
  31. 10
      Marlin/src/pins/sanguino/pins_GEN7_12.h
  32. 6
      Marlin/src/pins/sanguino/pins_GEN7_14.h
  33. 6
      Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
  34. 10
      Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
  35. 12
      Marlin/src/pins/stm32/pins_ARMED.h
  36. 2
      Marlin/src/pins/stm32/pins_BEAST.h
  37. 2
      Marlin/src/pins/stm32/pins_CHITU3D.h
  38. 2
      Marlin/src/pins/stm32/pins_STM32F1R.h
  39. 2
      Marlin/src/pins/stm32/pins_STM3R_MINI.h

18
Marlin/src/pins/linux/pins_RAMPS_LINUX.h
View File

@ -133,9 +133,9 @@
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
#define MAX6675_SS_PIN 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS_PIN 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
//
@ -222,9 +222,9 @@
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
#if NUM_SERVOS <= 1 // try to use servo connector first
#define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 6 // Hardware PWM
#elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2
#define CASE_LIGHT_PIN 44 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 44 // Hardware PWM
#endif
#endif
@ -233,12 +233,12 @@
//
#if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
#if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
#define SPINDLE_LASER_ENA_PIN 4 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 6 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
#define SPINDLE_DIR_PIN 5
#elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2
#define SPINDLE_LASER_ENA_PIN 40 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#define SPINDLE_DIR_PIN 65
#endif
#endif
@ -542,7 +542,7 @@
// Beeper on AUX-4
#define BEEPER_PIN 33
// Buttons are directly attached using AUX-2
// Buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#define SHIFT_OUT 40
#define SHIFT_CLK 44

4
Marlin/src/pins/mega/pins_MEGACONTROLLER.h
View File

@ -161,6 +161,6 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 6 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 7 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 7 // Pullup!
#define SPINDLE_DIR_PIN 8

6
Marlin/src/pins/mega/pins_MEGATRONICS.h
View File

@ -114,7 +114,7 @@
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
// Buttons directly attached using AUX-2
// Buttons directly attached to AUX-2
#define BTN_EN1 59
#define BTN_EN2 64
#define BTN_ENC 43
@ -126,6 +126,6 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 3 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 4 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 4 // Pullup!
#define SPINDLE_DIR_PIN 11

4
Marlin/src/pins/mega/pins_MEGATRONICS_2.h
View File

@ -141,6 +141,6 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 3 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 16 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 16 // Pullup!
#define SPINDLE_DIR_PIN 11

8
Marlin/src/pins/mega/pins_MEGATRONICS_3.h
View File

@ -174,8 +174,8 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if DISABLED(REPRAPWORLD_KEYPAD) // try to use the keypad connector first
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 43 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 43 // Pullup!
#define SPINDLE_DIR_PIN 42
#elif EXTRUDERS <= 2
// Hijack the last extruder so that we can get the PWM signal off the Y breakout
@ -189,7 +189,7 @@
#define Y_ENABLE_PIN 23
#define Y_STEP_PIN 22
#define Y_DIR_PIN 60
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 17 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 17 // Pullup!
#define SPINDLE_DIR_PIN 5
#endif

4
Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
View File

@ -135,8 +135,8 @@
// M3/M4/M5 - Spindle/Laser Control
//
// use P1 connector for spindle pins
#define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 18 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 18 // Pullup!
#define SPINDLE_DIR_PIN 19
//

4
Marlin/src/pins/rambo/pins_EINSY_RETRO.h
View File

@ -149,8 +149,8 @@
// M3/M4/M5 - Spindle/Laser Control
//
// use P1 connector for spindle pins
#define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 18 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 18 // Pullup!
#define SPINDLE_DIR_PIN 19
//

4
Marlin/src/pins/rambo/pins_MINIRAMBO.h
View File

@ -125,8 +125,8 @@
// M3/M4/M5 - Spindle/Laser Control
//
// use P1 connector for spindle pins
#define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 18 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 18 // Pullup!
#define SPINDLE_DIR_PIN 19
//

4
Marlin/src/pins/rambo/pins_RAMBO.h
View File

@ -149,8 +149,8 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 31 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 45 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 31 // Pullup!
#define SPINDLE_DIR_PIN 32
//

8
Marlin/src/pins/ramps/pins_3DRAG.h
View File

@ -44,7 +44,7 @@
#define RAMPS_D9_PIN 8
#define MOSFET_D_PIN 12
#define CASE_LIGHT_PIN -1 // MUST BE HARDWARE PWM but one is not available on expansion header
#define CASE_LIGHT_PIN -1 // Hardware PWM but one is not available on expansion header
#include "pins_RAMPS.h"
@ -152,11 +152,11 @@
#define Z_DIR_PIN 28
#define Z_ENABLE_PIN 24
#define Z_STEP_PIN 26
#define SPINDLE_LASER_PWM_PIN 46 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 62 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 46 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 62 // Pullup!
#define SPINDLE_DIR_PIN 48
#elif !BOTH(ULTRA_LCD, NEWPANEL) // use expansion header if no LCD in use
#define SPINDLE_LASER_ENA_PIN 16 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_ENA_PIN 16 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 17
#endif
#endif

4
Marlin/src/pins/ramps/pins_AZTEEG_X3.h
View File

@ -92,7 +92,7 @@
#undef SERVO0_PIN
#define SERVO0_PIN 11
#endif
#define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 20 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 7 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 20 // Pullup!
#define SPINDLE_DIR_PIN 21
#endif

9
Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
View File

@ -160,10 +160,9 @@
#if HAS_CUTTER // EXP2 header
#if ANY(VIKI2, miniVIKI)
#undef BTN_EN2
#define BTN_EN2 31 // need 7 for the spindle speed PWM
#define BTN_EN2 31 // Pin 7 needed for Spindle PWM
#endif
#define SPINDLE_LASER_PWM_PIN 7 // must have a hardware PWM
#define SPINDLE_LASER_ENA_PIN 20 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 21
#define SPINDLE_LASER_PWM_PIN 7 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 20 // Pullup!
#define SPINDLE_DIR_PIN 21
#endif

4
Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
View File

@ -34,9 +34,9 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENA_PIN 66 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_ENA_PIN 66 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 67
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#include "pins_RAMPS.h"

6
Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
View File

@ -50,8 +50,8 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENA_PIN 40 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#define SPINDLE_DIR_PIN 42
//
@ -94,7 +94,7 @@
#undef PS_ON_PIN // 12
#define PS_ON_PIN 81 // External Power Supply
#define CASE_LIGHT_PIN 44 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 44 // Hardware PWM
// This board has headers for Z-min, Z-max and IND_S_5V *but* as the bq team

4
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
View File

@ -113,9 +113,9 @@
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
#define MAX6675_SS_PIN 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS_PIN 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
//

12
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
View File

@ -43,21 +43,21 @@
//
#if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
#if !NUM_SERVOS // Try to use servo connector first
#define SPINDLE_LASER_ENA_PIN 6 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 6 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM
#define SPINDLE_DIR_PIN 5
#elif !GREEDY_PANEL // Try to use AUX2
#define SPINDLE_LASER_ENA_PIN 40 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#define SPINDLE_DIR_PIN 65
#endif
#endif
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
#if NUM_SERVOS <= 1 // Try to use servo connector first
#define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 6 // Hardware PWM
#elif !GREEDY_PANEL // Try to use AUX2
#define CASE_LIGHT_PIN 44 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 44 // Hardware PWM
#endif
#endif

4
Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
View File

@ -114,9 +114,9 @@
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
#define MAX6675_SS_PIN 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS_PIN 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
//

8
Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
View File

@ -114,9 +114,9 @@
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
#define MAX6675_SS_PIN 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS_PIN 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
@ -144,8 +144,8 @@
#define LED_PIN 13
#endif
#define SPINDLE_LASER_PWM_PIN -1 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 4 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN -1 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 4 // Pullup!
// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
#define FILWIDTH_PIN 5 // Analog Input

4
Marlin/src/pins/ramps/pins_MKS_BASE.h
View File

@ -44,8 +44,8 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 2 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 15 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 2 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 15 // Pullup!
#define SPINDLE_DIR_PIN 19
#include "pins_RAMPS.h"

18
Marlin/src/pins/ramps/pins_RAMPS.h
View File

@ -169,9 +169,9 @@
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
#define MAX6675_SS_PIN 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS_PIN 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
//
@ -262,9 +262,9 @@
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
#if NUM_SERVOS <= 1 // try to use servo connector first
#define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 6 // Hardware PWM
#elif AUX2_PINS_FREE
#define CASE_LIGHT_PIN 44 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 44 // Hardware PWM
#endif
#endif
@ -273,12 +273,12 @@
//
#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
#if !NUM_SERVOS // Use servo connector if possible
#define SPINDLE_LASER_ENA_PIN 4 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 6 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
#define SPINDLE_DIR_PIN 5
#elif AUX2_PINS_FREE
#define SPINDLE_LASER_ENA_PIN 40 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#define SPINDLE_DIR_PIN 65
#else
#error "No auto-assignable Spindle/Laser pins available."
@ -621,7 +621,7 @@
// Beeper on AUX-4
#define BEEPER_PIN 33
// Buttons are directly attached using AUX-2
// Buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#define SHIFT_OUT 40
#define SHIFT_CLK 44

10
Marlin/src/pins/ramps/pins_RAMPS_OLD.h
View File

@ -78,9 +78,9 @@
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
#define MAX6675_SS_PIN 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS_PIN 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
//
@ -106,11 +106,11 @@
#define SDPOWER 48
#define SDSS 53
#define LED_PIN 13
#define CASE_LIGHT_PIN 45 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 45 // Hardware PWM
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENA_PIN 41 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 41 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 45 // Hardware PWM
#define SPINDLE_DIR_PIN 43

4
Marlin/src/pins/ramps/pins_RUMBA.h
View File

@ -156,10 +156,10 @@
// M3/M4/M5 - Spindle/Laser Control
//
#ifndef SPINDLE_LASER_PWM_PIN
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM. Pin 4 interrupts OC0* and OC1* always in use?
#define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM. Pin 4 interrupts OC0* and OC1* always in use?
#endif
#ifndef SPINDLE_LASER_ENA_PIN
#define SPINDLE_LASER_ENA_PIN 14 // Pin should have a pullup!
#define SPINDLE_LASER_ENA_PIN 14 // Pullup!
#endif
#ifndef SPINDLE_DIR_PIN
#define SPINDLE_DIR_PIN 15

4
Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
View File

@ -132,8 +132,8 @@
#if HAS_CUTTER // use the LED_PIN for spindle speed control or case light
#undef LED_PIN
#define SPINDLE_DIR_PIN 16
#define SPINDLE_LASER_ENA_PIN 17 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 8 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 17 // Pullup!
#define SPINDLE_LASER_PWM_PIN 8 // Hardware PWM
#else
#undef LED_PIN
#define CASE_LIGHT_PIN 8

4
Marlin/src/pins/ramps/pins_ULTIMAKER.h
View File

@ -160,6 +160,6 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 10 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 10 // Pullup!
#define SPINDLE_DIR_PIN 11 // use the EXP3 PWM header

8
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
View File

@ -242,13 +242,13 @@
*/
#if EXTRUDERS == 1
#define SPINDLE_DIR_PIN 43
#define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 41 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 45 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 41 // Pullup!
#elif TEMP_SENSOR_BED == 0 // Can't use E0 so see if HEATER_BED_PIN is available
#undef HEATER_BED_PIN
#define SPINDLE_DIR_PIN 38 // Probably pin 4 on 10 pin connector closest to the E0 socket
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM - Special precautions usually needed.
#define SPINDLE_LASER_ENA_PIN 40 // Pin should have a pullup! (Probably pin 6 on the 10-pin
#define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM - Special precautions usually needed.
#define SPINDLE_LASER_ENA_PIN 40 // Pullup! (Probably pin 6 on the 10-pin
// connector closest to the E0 socket)
#endif
#endif

12
Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
View File

@ -161,9 +161,9 @@
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
#if NUM_SERVOS <= 1 // try to use servo connector first
#define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 6 // Hardware PWM
#elif AUX2_PINS_FREE
#define CASE_LIGHT_PIN 44 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 44 // Hardware PWM
#endif
#endif
@ -172,12 +172,12 @@
//
#if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
#if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
#define SPINDLE_LASER_ENA_PIN 4 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 6 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
#define SPINDLE_DIR_PIN 5
#elif AUX2_PINS_FREE
#define SPINDLE_LASER_ENA_PIN 40 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#define SPINDLE_DIR_PIN 65
#endif
#endif

4
Marlin/src/pins/sam/pins_RAMPS_DUO.h
View File

@ -67,9 +67,9 @@
// SPI for Max6675 or Max31855 Thermocouple
#undef MAX6675_SS_PIN
#if DISABLED(SDSUPPORT)
#define MAX6675_SS_PIN 69 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#define MAX6675_SS_PIN 69 // Don't use 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS_PIN 69 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS_PIN 69 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
//

2
Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
View File

@ -230,6 +230,6 @@
//
#if HOTENDS < 3 && HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
#define SPINDLE_LASER_ENA_PIN 45 // Use E2 ENA
#define SPINDLE_LASER_PWM_PIN 12 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_PWM_PIN 12 // Hardware PWM
#define SPINDLE_DIR_PIN 47 // Use E2 DIR
#endif

4
Marlin/src/pins/sam/pins_RAMPS_SMART.h
View File

@ -90,9 +90,9 @@
// SPI for Max6675 or Max31855 Thermocouple
#undef MAX6675_SS_PIN
#if DISABLED(SDSUPPORT)
#define MAX6675_SS_PIN 67 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#define MAX6675_SS_PIN 67 // Don't use 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS_PIN 67 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS_PIN 67 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
//

6
Marlin/src/pins/sanguino/pins_GEN6.h
View File

@ -106,7 +106,7 @@
//
#define SDSS 17
#define DEBUG_PIN 0
#define CASE_LIGHT_PIN 16 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 16 // Hardware PWM
// RS485 pins
#define TX_ENABLE_PIN 12
@ -115,6 +115,6 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENA_PIN 5 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 16 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 5 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
#define SPINDLE_DIR_PIN 6

10
Marlin/src/pins/sanguino/pins_GEN7_12.h
View File

@ -123,9 +123,9 @@
#define PS_ON_PIN 15
#if GEN7_VERSION < 13
#define CASE_LIGHT_PIN 16 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 16 // Hardware PWM
#else // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
#define CASE_LIGHT_PIN 15 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 15 // Hardware PWM
#endif
// All these generations of Gen7 supply thermistor power
@ -141,10 +141,10 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENA_PIN 10 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 11
#if GEN7_VERSION < 13
#define SPINDLE_LASER_PWM_PIN 16 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
#else // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
#define SPINDLE_LASER_PWM_PIN 15 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_PWM_PIN 15 // Hardware PWM
#endif

6
Marlin/src/pins/sanguino/pins_GEN7_14.h
View File

@ -102,7 +102,7 @@
// Misc. Functions
//
#define PS_ON_PIN 15
#define CASE_LIGHT_PIN 15 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 15 // Hardware PWM
// A pin for debugging
#define DEBUG_PIN 0
@ -114,6 +114,6 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENA_PIN 20 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 16 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 20 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
#define SPINDLE_DIR_PIN 21

6
Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
View File

@ -104,7 +104,7 @@
//
#define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support
#define PS_ON_PIN 19
#define CASE_LIGHT_PIN 15 // MUST BE HARDWARE PWM
#define CASE_LIGHT_PIN 15 // Hardware PWM
// A pin for debugging
#define DEBUG_PIN -1
@ -134,6 +134,6 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENA_PIN 5 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 16 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 5 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
#define SPINDLE_DIR_PIN 6

10
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
View File

@ -139,7 +139,7 @@
#endif
#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL) // try to use IO Header
#define CASE_LIGHT_PIN 4 // MUST BE HARDWARE PWM - see if IO Header is available
#define CASE_LIGHT_PIN 4 // Hardware PWM - see if IO Header is available
#endif
/**
@ -280,8 +280,8 @@
#if HAS_CUTTER
#if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL) // try to use IO Header
#define SPINDLE_LASER_ENA_PIN 10 // Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM
#define SPINDLE_DIR_PIN 11
#elif !MB(MELZI) // use X stepper motor socket
@ -319,8 +319,8 @@
#define X_DIR_PIN 0
#define X_ENABLE_PIN 14
#define X_STEP_PIN 1
#define SPINDLE_LASER_PWM_PIN 15 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 21 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 15 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 21 // Pullup!
#define SPINDLE_DIR_PIN -1 // No pin available on the socket for the direction pin
#endif
#endif

12
Marlin/src/pins/stm32/pins_ARMED.h
View File

@ -113,13 +113,13 @@
//
// Heaters / Fans
//
#define HEATER_0_PIN PA1 // PWM pin
#define HEATER_1_PIN PA2 // PWM pin
#define HEATER_BED_PIN PA0 // PWM pin
#define HEATER_0_PIN PA1 // Hardware PWM
#define HEATER_1_PIN PA2 // Hardware PWM
#define HEATER_BED_PIN PA0 // Hardware PWM
#define FAN_PIN PC6 // PWM pin, Part cooling fan
#define FAN1_PIN PC7 // PWM pin, Extruder fan
#define FAN2_PIN PC8 // PWM pin, Controller fan
#define FAN_PIN PC6 // Hardware PWM, Part cooling fan
#define FAN1_PIN PC7 // Hardware PWM, Extruder fan
#define FAN2_PIN PC8 // Hardware PWM, Controller fan
//
// Misc functions

2
Marlin/src/pins/stm32/pins_BEAST.h
View File

@ -255,7 +255,7 @@
// Beeper on AUX-4
#define BEEPER_PIN 33
// buttons are directly attached using AUX-2
// buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64
#define BTN_EN2 59

2
Marlin/src/pins/stm32/pins_CHITU3D.h
View File

@ -253,7 +253,7 @@
// Beeper on AUX-4
#define BEEPER_PIN 33
// buttons are directly attached using AUX-2
// buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64
#define BTN_EN2 59

2
Marlin/src/pins/stm32/pins_STM32F1R.h
View File

@ -233,7 +233,7 @@
// Beeper on AUX-4
#define BEEPER_PIN 33
// buttons are directly attached using AUX-2
// buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64
#define BTN_EN2 59

2
Marlin/src/pins/stm32/pins_STM3R_MINI.h
View File

@ -249,7 +249,7 @@
// Beeper on AUX-4
#define BEEPER_PIN 33
// buttons are directly attached using AUX-2
// buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64
#define BTN_EN2 59

Write Preview
Loading…
Cancel
Save