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

SPINDLE_LASER_ENABLE => SPINDLE_LASER_ENA

pull/1/head
Scott Lahteine 5 years ago
parent
9abe9aff56
commit
c8a83fb122
51 changed files with 90 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/src/HAL/HAL_AVR/SanityCheck.h
  2. 4
      Marlin/src/HAL/HAL_LINUX/SanityCheck.h
  3. 4
      Marlin/src/HAL/HAL_LPC1768/SanityCheck.h
  4. 4
      Marlin/src/HAL/HAL_STM32/SanityCheck.h
  5. 4
      Marlin/src/HAL/HAL_STM32F1/SanityCheck.h
  6. 4
      Marlin/src/HAL/HAL_STM32F4/SanityCheck.h
  7. 4
      Marlin/src/HAL/HAL_STM32F7/SanityCheck.h
  8. 2
      Marlin/src/Marlin.cpp
  9. 12
      Marlin/src/gcode/control/M3-M5.cpp
  10. 2
      Marlin/src/inc/SanityCheck.h
  11. 4
      Marlin/src/pins/pinsDebug_list.h
  12. 8
      Marlin/src/pins/pins_3DRAG.h
  13. 4
      Marlin/src/pins/pins_AZTEEG_X3.h
  14. 4
      Marlin/src/pins/pins_AZTEEG_X3_PRO.h
  15. 2
      Marlin/src/pins/pins_BAM_DICE_DUE.h
  16. 2
      Marlin/src/pins/pins_BQ_ZUM_MEGA_3D.h
  17. 2
      Marlin/src/pins/pins_COHESION3D_MINI.h
  18. 2
      Marlin/src/pins/pins_COHESION3D_REMIX.h
  19. 2
      Marlin/src/pins/pins_EINSY_RAMBO.h
  20. 2
      Marlin/src/pins/pins_EINSY_RETRO.h
  21. 2
      Marlin/src/pins/pins_FELIX2.h
  22. 8
      Marlin/src/pins/pins_FORMBOT_RAPTOR2.h
  23. 2
      Marlin/src/pins/pins_FORMBOT_TREX3.h
  24. 2
      Marlin/src/pins/pins_GEN6.h
  25. 2
      Marlin/src/pins/pins_GEN7_12.h
  26. 2
      Marlin/src/pins/pins_GEN7_14.h
  27. 2
      Marlin/src/pins/pins_GEN7_CUSTOM.h
  28. 2
      Marlin/src/pins/pins_MEGACONTROLLER.h
  29. 2
      Marlin/src/pins/pins_MEGATRONICS.h
  30. 2
      Marlin/src/pins/pins_MEGATRONICS_2.h
  31. 4
      Marlin/src/pins/pins_MEGATRONICS_3.h
  32. 2
      Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
  33. 2
      Marlin/src/pins/pins_MINIRAMBO.h
  34. 2
      Marlin/src/pins/pins_MINITRONICS.h
  35. 2
      Marlin/src/pins/pins_MKS_BASE.h
  36. 2
      Marlin/src/pins/pins_MKS_BASE_14.h
  37. 2
      Marlin/src/pins/pins_RAMBO.h
  38. 8
      Marlin/src/pins/pins_RAMPS.h
  39. 4
      Marlin/src/pins/pins_RAMPS_FD_V1.h
  40. 8
      Marlin/src/pins/pins_RAMPS_LINUX.h
  41. 2
      Marlin/src/pins/pins_RAMPS_OLD.h
  42. 6
      Marlin/src/pins/pins_RAMPS_RE_ARM.h
  43. 4
      Marlin/src/pins/pins_RUMBA.h
  44. 6
      Marlin/src/pins/pins_SANGUINOLOLU_11.h
  45. 2
      Marlin/src/pins/pins_SAV_MKI.h
  46. 2
      Marlin/src/pins/pins_STM3R_MINI.h
  47. 2
      Marlin/src/pins/pins_TEENSY2.h
  48. 2
      Marlin/src/pins/pins_TEENSYLU.h
  49. 2
      Marlin/src/pins/pins_ULTIMAIN_2.h
  50. 2
      Marlin/src/pins/pins_ULTIMAKER.h
  51. 10
      Marlin/src/pins/pins_ULTIMAKER_OLD.h

4
Marlin/src/HAL/HAL_AVR/SanityCheck.h
View File

@ -46,8 +46,8 @@
* Sanity checks for Spindle / Laser * Sanity checks for Spindle / Laser
*/ */
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#if !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if !PIN_EXISTS(SPINDLE_LASER_ENA)
#error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN." #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
#elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR) #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
#error "SPINDLE_DIR_PIN not defined." #error "SPINDLE_DIR_PIN not defined."
#elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM) #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

4
Marlin/src/HAL/HAL_LINUX/SanityCheck.h
View File

@ -25,8 +25,8 @@
*/ */
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#if !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if !PIN_EXISTS(SPINDLE_LASER_ENA)
#error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN." #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
#elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR) #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
#error "SPINDLE_DIR_PIN not defined." #error "SPINDLE_DIR_PIN not defined."
#elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM) #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

4
Marlin/src/HAL/HAL_LPC1768/SanityCheck.h
View File

@ -25,8 +25,8 @@
*/ */
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#if !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if !PIN_EXISTS(SPINDLE_LASER_ENA)
#error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN." #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
#elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR) #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
#error "SPINDLE_DIR_PIN not defined." #error "SPINDLE_DIR_PIN not defined."
#elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM) #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

4
Marlin/src/HAL/HAL_STM32/SanityCheck.h
View File

@ -25,8 +25,8 @@
* Test Re-ARM specific configuration values for errors at compile-time. * Test Re-ARM specific configuration values for errors at compile-time.
*/ */
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#if !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if !PIN_EXISTS(SPINDLE_LASER_ENA)
#error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN." #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
#elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR) #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
#error "SPINDLE_DIR_PIN not defined." #error "SPINDLE_DIR_PIN not defined."
#elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM) #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

4
Marlin/src/HAL/HAL_STM32F1/SanityCheck.h
View File

@ -28,8 +28,8 @@
* Test Re-ARM specific configuration values for errors at compile-time. * Test Re-ARM specific configuration values for errors at compile-time.
*/ */
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#if !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if !PIN_EXISTS(SPINDLE_LASER_ENA)
#error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN." #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
#elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR) #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
#error "SPINDLE_DIR_PIN not defined." #error "SPINDLE_DIR_PIN not defined."
#elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM) #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

4
Marlin/src/HAL/HAL_STM32F4/SanityCheck.h
View File

@ -24,8 +24,8 @@
* Test Re-ARM specific configuration values for errors at compile-time. * Test Re-ARM specific configuration values for errors at compile-time.
*/ */
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#if !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if !PIN_EXISTS(SPINDLE_LASER_ENA)
#error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN." #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
#elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR) #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
#error "SPINDLE_DIR_PIN not defined." #error "SPINDLE_DIR_PIN not defined."
#elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM) #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

4
Marlin/src/HAL/HAL_STM32F7/SanityCheck.h
View File

@ -24,8 +24,8 @@
* Test Re-ARM specific configuration values for errors at compile-time. * Test Re-ARM specific configuration values for errors at compile-time.
*/ */
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#if !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if !PIN_EXISTS(SPINDLE_LASER_ENA)
#error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN." #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
#elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR) #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
#error "SPINDLE_DIR_PIN not defined." #error "SPINDLE_DIR_PIN not defined."
#elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM) #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

2
Marlin/src/Marlin.cpp
View File

@ -975,7 +975,7 @@ void setup() {
#endif #endif
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
OUT_WRITE(SPINDLE_LASER_ENABLE_PIN, !SPINDLE_LASER_ENABLE_INVERT); // init spindle to off OUT_WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ENABLE_INVERT); // init spindle to off
#if SPINDLE_DIR_CHANGE #if SPINDLE_DIR_CHANGE
OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR ? 255 : 0); // init rotation to clockwise (M3) OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR ? 255 : 0); // init rotation to clockwise (M3)
#endif #endif

12
Marlin/src/gcode/control/M3-M5.cpp
View File

@ -53,7 +53,7 @@ uint8_t spindle_laser_power; // = 0
* NOTE: A minimum PWM frequency of 50 Hz is needed. All prescaler * NOTE: A minimum PWM frequency of 50 Hz is needed. All prescaler
* factors for timers 2, 3, 4, and 5 are acceptable. * factors for timers 2, 3, 4, and 5 are acceptable.
* *
* SPINDLE_LASER_ENABLE_PIN needs an external pullup or it may power on * SPINDLE_LASER_ENA_PIN needs an external pullup or it may power on
* the spindle/laser during power-up or when connecting to the host * the spindle/laser during power-up or when connecting to the host
* (usually goes through a reset which sets all I/O pins to tri-state) * (usually goes through a reset which sets all I/O pins to tri-state)
* *
@ -73,7 +73,7 @@ inline void delay_for_power_down() { safe_delay(SPINDLE_LASER_POWERDOWN_DELAY);
*/ */
inline void set_spindle_laser_ocr(const uint8_t ocr) { inline void set_spindle_laser_ocr(const uint8_t ocr) {
WRITE(SPINDLE_LASER_ENABLE_PIN, SPINDLE_LASER_ENABLE_INVERT); // turn spindle on (active low) WRITE(SPINDLE_LASER_ENA_PIN, SPINDLE_LASER_ENABLE_INVERT); // turn spindle on (active low)
analogWrite(SPINDLE_LASER_PWM_PIN, (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr); analogWrite(SPINDLE_LASER_PWM_PIN, (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr);
} }
@ -81,7 +81,7 @@ inline void set_spindle_laser_ocr(const uint8_t ocr) {
void update_spindle_laser_power() { void update_spindle_laser_power() {
if (spindle_laser_power == 0) { if (spindle_laser_power == 0) {
WRITE(SPINDLE_LASER_ENABLE_PIN, !SPINDLE_LASER_ENABLE_INVERT); // turn spindle off (active low) WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ENABLE_INVERT); // turn spindle off (active low)
analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0); // only write low byte analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0); // only write low byte
delay_for_power_down(); delay_for_power_down();
} }
@ -101,7 +101,7 @@ inline void set_spindle_laser_ocr(const uint8_t ocr) {
#endif // SPINDLE_LASER_PWM #endif // SPINDLE_LASER_PWM
bool spindle_laser_enabled() { bool spindle_laser_enabled() {
return !!spindle_laser_power; // READ(SPINDLE_LASER_ENABLE_PIN) == SPINDLE_LASER_ENABLE_INVERT; return !!spindle_laser_power; // READ(SPINDLE_LASER_ENA_PIN) == SPINDLE_LASER_ENABLE_INVERT;
} }
void set_spindle_laser_enabled(const bool enable) { void set_spindle_laser_enabled(const bool enable) {
@ -111,11 +111,11 @@ void set_spindle_laser_enabled(const bool enable) {
update_spindle_laser_power(); update_spindle_laser_power();
#else #else
if (enable) { if (enable) {
WRITE(SPINDLE_LASER_ENABLE_PIN, SPINDLE_LASER_ENABLE_INVERT); WRITE(SPINDLE_LASER_ENA_PIN, SPINDLE_LASER_ENABLE_INVERT);
delay_for_power_up(); delay_for_power_up();
} }
else { else {
WRITE(SPINDLE_LASER_ENABLE_PIN, !SPINDLE_LASER_ENABLE_INVERT); WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ENABLE_INVERT);
delay_for_power_down(); delay_for_power_down();
} }
#endif #endif

2
Marlin/src/inc/SanityCheck.h
View File

@ -341,6 +341,8 @@
#error "MAX6675_SS is now MAX6675_SS_PIN. Please update your configuration and/or pins." #error "MAX6675_SS is now MAX6675_SS_PIN. Please update your configuration and/or pins."
#elif defined(MAX6675_SS2) #elif defined(MAX6675_SS2)
#error "MAX6675_SS2 is now MAX6675_SS2_PIN. Please update your configuration and/or pins." #error "MAX6675_SS2 is now MAX6675_SS2_PIN. Please update your configuration and/or pins."
#elif defined(SPINDLE_LASER_ENABLE_PIN)
#error "SPINDLE_LASER_ENABLE_PIN is now SPINDLE_LASER_ENA_PIN. Please update your configuration and/or pins."
#elif defined(TMC_Z_CALIBRATION) #elif defined(TMC_Z_CALIBRATION)
#error "TMC_Z_CALIBRATION has been deprecated in favor of Z_STEPPER_AUTO_ALIGN. Please update your configuration." #error "TMC_Z_CALIBRATION has been deprecated in favor of Z_STEPPER_AUTO_ALIGN. Please update your configuration."
#elif defined(Z_MIN_PROBE_ENDSTOP) #elif defined(Z_MIN_PROBE_ENDSTOP)

4
Marlin/src/pins/pinsDebug_list.h
View File

@ -788,8 +788,8 @@
#if PIN_EXISTS(SPINDLE_ENABLE) #if PIN_EXISTS(SPINDLE_ENABLE)
REPORT_NAME_DIGITAL(__LINE__, SPINDLE_ENABLE_PIN) REPORT_NAME_DIGITAL(__LINE__, SPINDLE_ENABLE_PIN)
#endif #endif
#if PIN_EXISTS(SPINDLE_LASER_ENABLE) #if PIN_EXISTS(SPINDLE_LASER_ENA)
REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_ENABLE_PIN) REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_ENA_PIN)
#endif #endif
#if PIN_EXISTS(SPINDLE_LASER_PWM) #if PIN_EXISTS(SPINDLE_LASER_PWM)
REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_PWM_PIN) REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_PWM_PIN)

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

@ -124,7 +124,7 @@
* *
* stepper signal socket name socket name * stepper signal socket name socket name
* ------- * -------
* SPINDLE_LASER_ENABLE_PIN /ENABLE O| |O VMOT * SPINDLE_LASER_ENA_PIN /ENABLE O| |O VMOT
* MS1 O| |O GND * MS1 O| |O GND
* MS2 O| |O 2B * MS2 O| |O 2B
* MS3 O| |O 2A * MS3 O| |O 2A
@ -137,7 +137,7 @@
* Note: Socket names vary from vendor to vendor * Note: Socket names vary from vendor to vendor
*/ */
#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are not good with 3DRAG #undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are not good with 3DRAG
#undef SPINDLE_LASER_ENABLE_PIN #undef SPINDLE_LASER_ENA_PIN
#undef SPINDLE_DIR_PIN #undef SPINDLE_DIR_PIN
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
@ -152,10 +152,10 @@
#define Z_ENABLE_PIN 24 #define Z_ENABLE_PIN 24
#define Z_STEP_PIN 26 #define Z_STEP_PIN 26
#define SPINDLE_LASER_PWM_PIN 46 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 46 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 62 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 62 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 48 #define SPINDLE_DIR_PIN 48
#elif !BOTH(ULTRA_LCD, NEWPANEL) // use expansion header if no LCD in use #elif !BOTH(ULTRA_LCD, NEWPANEL) // use expansion header if no LCD in use
#define SPINDLE_LASER_ENABLE_PIN 16 // Pin should have a pullup/pulldown! #define SPINDLE_LASER_ENA_PIN 16 // Pin should have a pullup/pulldown!
#define SPINDLE_DIR_PIN 17 #define SPINDLE_DIR_PIN 17
#endif #endif
#endif #endif

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

@ -83,7 +83,7 @@
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3 board #undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
#undef SPINDLE_LASER_ENABLE_PIN #undef SPINDLE_LASER_ENA_PIN
#undef SPINDLE_DIR_PIN #undef SPINDLE_DIR_PIN
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
@ -94,6 +94,6 @@
#define SERVO0_PIN 11 #define SERVO0_PIN 11
#endif #endif
#define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 20 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 20 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 21 #define SPINDLE_DIR_PIN 21
#endif #endif

4
Marlin/src/pins/pins_AZTEEG_X3_PRO.h
View File

@ -162,7 +162,7 @@
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board #undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board
#undef SPINDLE_LASER_ENABLE_PIN #undef SPINDLE_LASER_ENA_PIN
#undef SPINDLE_DIR_PIN #undef SPINDLE_DIR_PIN
#if ENABLED(SPINDLE_LASER_ENABLE) // EXP2 header #if ENABLED(SPINDLE_LASER_ENABLE) // EXP2 header
@ -171,6 +171,6 @@
#define BTN_EN2 31 // need 7 for the spindle speed PWM #define BTN_EN2 31 // need 7 for the spindle speed PWM
#endif #endif
#define SPINDLE_LASER_PWM_PIN 7 // must have a hardware PWM #define SPINDLE_LASER_PWM_PIN 7 // must have a hardware PWM
#define SPINDLE_LASER_ENABLE_PIN 20 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 20 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 21 #define SPINDLE_DIR_PIN 21
#endif #endif

2
Marlin/src/pins/pins_BAM_DICE_DUE.h
View File

@ -33,7 +33,7 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_ENABLE_PIN 66 // Pin should have a pullup/pulldown! #define SPINDLE_LASER_ENA_PIN 66 // Pin should have a pullup/pulldown!
#define SPINDLE_DIR_PIN 67 #define SPINDLE_DIR_PIN 67
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM

2
Marlin/src/pins/pins_BQ_ZUM_MEGA_3D.h
View File

@ -49,7 +49,7 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_ENABLE_PIN 40 // Pin should have a pullup/pulldown! #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_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 42 #define SPINDLE_DIR_PIN 42

2
Marlin/src/pins/pins_COHESION3D_MINI.h
View File

@ -118,7 +118,7 @@
// //
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#undef HEATER_0_PIN #undef HEATER_0_PIN
#define SPINDLE_LASER_ENABLE_PIN P2_07 // FET 1 #define SPINDLE_LASER_ENA_PIN P2_07 // FET 1
#undef HEATER_BED_PIN #undef HEATER_BED_PIN
#define SPINDLE_LASER_PWM_PIN P2_05 // Bed FET #define SPINDLE_LASER_PWM_PIN P2_05 // Bed FET
#undef FAN_PIN #undef FAN_PIN

2
Marlin/src/pins/pins_COHESION3D_REMIX.h
View File

@ -139,7 +139,7 @@
// //
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#undef HEATER_0_PIN #undef HEATER_0_PIN
#define SPINDLE_LASER_ENABLE_PIN P2_07 // FET 1 #define SPINDLE_LASER_ENA_PIN P2_07 // FET 1
#undef HEATER_BED_PIN #undef HEATER_BED_PIN
#define SPINDLE_LASER_PWM_PIN P2_05 // Bed FET #define SPINDLE_LASER_PWM_PIN P2_05 // Bed FET
#undef FAN_PIN #undef FAN_PIN

2
Marlin/src/pins/pins_EINSY_RAMBO.h
View File

@ -135,7 +135,7 @@
// //
// use P1 connector for spindle pins // use P1 connector for spindle pins
#define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 18 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 18 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 19 #define SPINDLE_DIR_PIN 19
// //

2
Marlin/src/pins/pins_EINSY_RETRO.h
View File

@ -149,7 +149,7 @@
// //
// use P1 connector for spindle pins // use P1 connector for spindle pins
#define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 18 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 18 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 19 #define SPINDLE_DIR_PIN 19
// //

2
Marlin/src/pins/pins_FELIX2.h
View File

@ -59,5 +59,5 @@
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are not valid with this board #undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are not valid with this board
#undef SPINDLE_LASER_ENABLE_PIN #undef SPINDLE_LASER_ENA_PIN
#undef SPINDLE_DIR_PIN #undef SPINDLE_DIR_PIN

8
Marlin/src/pins/pins_FORMBOT_RAPTOR2.h
View File

@ -40,13 +40,13 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
#if !NUM_SERVOS // Try to use servo connector first #if !NUM_SERVOS // Try to use servo connector first
#define SPINDLE_LASER_ENABLE_PIN 6 // Pin should have a pullup/pulldown! #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_PWM_PIN 4 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 5 #define SPINDLE_DIR_PIN 5
#elif !GREEDY_PANEL // Try to use AUX2 #elif !GREEDY_PANEL // Try to use AUX2
#define SPINDLE_LASER_ENABLE_PIN 40 // Pin should have a pullup/pulldown! #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_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 65 #define SPINDLE_DIR_PIN 65
#endif #endif
@ -62,6 +62,6 @@
#undef GREEDY_PANEL #undef GREEDY_PANEL
#if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && (CASE_LIGHT_PIN == SPINDLE_LASER_ENABLE_PIN || CASE_LIGHT_PIN == SPINDLE_LASER_PWM_PIN) #if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && (CASE_LIGHT_PIN == SPINDLE_LASER_ENA_PIN || CASE_LIGHT_PIN == SPINDLE_LASER_PWM_PIN)
#error "CASE_LIGHT_PIN conflicts with a Spindle / Laser pin." #error "CASE_LIGHT_PIN conflicts with a Spindle / Laser pin."
#endif #endif

2
Marlin/src/pins/pins_FORMBOT_TREX3.h
View File

@ -144,7 +144,7 @@
#endif #endif
#define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 4 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 4 // Pin should have a pullup!
// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
#define FILWIDTH_PIN 5 // Analog Input #define FILWIDTH_PIN 5 // Analog Input

2
Marlin/src/pins/pins_GEN6.h
View File

@ -114,6 +114,6 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_ENABLE_PIN 5 // Pin should have a pullup/pulldown! #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_PWM_PIN 16 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 6 #define SPINDLE_DIR_PIN 6

2
Marlin/src/pins/pins_GEN7_12.h
View File

@ -140,7 +140,7 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_ENABLE_PIN 10 // Pin should have a pullup/pulldown! #define SPINDLE_LASER_ENA_PIN 10 // Pin should have a pullup/pulldown!
#define SPINDLE_DIR_PIN 11 #define SPINDLE_DIR_PIN 11
#if GEN7_VERSION < 13 #if GEN7_VERSION < 13
#define SPINDLE_LASER_PWM_PIN 16 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 16 // MUST BE HARDWARE PWM

2
Marlin/src/pins/pins_GEN7_14.h
View File

@ -113,6 +113,6 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_ENABLE_PIN 20 // Pin should have a pullup/pulldown! #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_PWM_PIN 16 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 21 #define SPINDLE_DIR_PIN 21

2
Marlin/src/pins/pins_GEN7_CUSTOM.h
View File

@ -133,6 +133,6 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_ENABLE_PIN 5 // Pin should have a pullup/pulldown! #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_PWM_PIN 16 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 6 #define SPINDLE_DIR_PIN 6

2
Marlin/src/pins/pins_MEGACONTROLLER.h
View File

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

2
Marlin/src/pins/pins_MEGATRONICS.h
View File

@ -126,5 +126,5 @@
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_PWM_PIN 3 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 3 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 4 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 4 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 11 #define SPINDLE_DIR_PIN 11

2
Marlin/src/pins/pins_MEGATRONICS_2.h
View File

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

4
Marlin/src/pins/pins_MEGATRONICS_3.h
View File

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

2
Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
View File

@ -263,7 +263,7 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_ENABLE_PIN 66 // K4 Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 66 // K4 Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 8 // H5 MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 8 // H5 MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 67 // K5 #define SPINDLE_DIR_PIN 67 // K5

2
Marlin/src/pins/pins_MINIRAMBO.h
View File

@ -125,7 +125,7 @@
// //
// use P1 connector for spindle pins // use P1 connector for spindle pins
#define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 18 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 18 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 19 #define SPINDLE_DIR_PIN 19
// //

2
Marlin/src/pins/pins_MINITRONICS.h
View File

@ -138,7 +138,7 @@
#define HEATER_BED_PIN 4 // won't compile #define HEATER_BED_PIN 4 // won't compile
#define TEMP_BED_PIN 50 #define TEMP_BED_PIN 50
#define TEMP_0_PIN 51 #define TEMP_0_PIN 51
#define SPINDLE_LASER_ENABLE_PIN 52 // using A6 because it already has a pullup #define SPINDLE_LASER_ENA_PIN 52 // using A6 because it already has a pullup
#define SPINDLE_LASER_PWM_PIN 3 // WARNING - LED & resistor pull up to +12/+24V stepper voltage #define SPINDLE_LASER_PWM_PIN 3 // WARNING - LED & resistor pull up to +12/+24V stepper voltage
#define SPINDLE_DIR_PIN 53 #define SPINDLE_DIR_PIN 53
#endif #endif

2
Marlin/src/pins/pins_MKS_BASE.h
View File

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

2
Marlin/src/pins/pins_MKS_BASE_14.h
View File

@ -47,7 +47,7 @@
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_PWM_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup!
#define SPINDLE_DIR_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX #define SPINDLE_DIR_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX
// //

2
Marlin/src/pins/pins_RAMBO.h
View File

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

8
Marlin/src/pins/pins_RAMPS.h
View File

@ -231,7 +231,7 @@
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#endif #endif
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENABLE_PIN) #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
#if NUM_SERVOS <= 1 // try to use servo connector first #if NUM_SERVOS <= 1 // try to use servo connector first
#define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM #define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM
#elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2 #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2
@ -242,13 +242,13 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
#if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
#define SPINDLE_LASER_ENABLE_PIN 4 // Pin should have a pullup/pulldown! #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_PWM_PIN 6 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 5 #define SPINDLE_DIR_PIN 5
#elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2 #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2
#define SPINDLE_LASER_ENABLE_PIN 40 // Pin should have a pullup/pulldown! #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_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 65 #define SPINDLE_DIR_PIN 65
#endif #endif

4
Marlin/src/pins/pins_RAMPS_FD_V1.h
View File

@ -198,9 +198,9 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
#if HOTENDS < 3 #if HOTENDS < 3
#define SPINDLE_LASER_ENABLE_PIN 45 // Use E2 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 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 47 // Use E2 DIR #define SPINDLE_DIR_PIN 47 // Use E2 DIR
#endif #endif

8
Marlin/src/pins/pins_RAMPS_LINUX.h
View File

@ -217,7 +217,7 @@
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#endif #endif
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENABLE_PIN) #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
#if NUM_SERVOS <= 1 // try to use servo connector first #if NUM_SERVOS <= 1 // try to use servo connector first
#define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM #define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM
#elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2 #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2
@ -228,13 +228,13 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
#if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
#define SPINDLE_LASER_ENABLE_PIN 4 // Pin should have a pullup/pulldown! #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_PWM_PIN 6 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 5 #define SPINDLE_DIR_PIN 5
#elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2 #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2
#define SPINDLE_LASER_ENABLE_PIN 40 // Pin should have a pullup/pulldown! #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_PWM_PIN 44 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 65 #define SPINDLE_DIR_PIN 65
#endif #endif

2
Marlin/src/pins/pins_RAMPS_OLD.h
View File

@ -110,6 +110,6 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_ENABLE_PIN 41 // Pin should have a pullup/pulldown! #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_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 43 #define SPINDLE_DIR_PIN 43

6
Marlin/src/pins/pins_RAMPS_RE_ARM.h
View File

@ -200,7 +200,7 @@
#define MAX6675_SS_PIN P1_28 #define MAX6675_SS_PIN P1_28
#endif #endif
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN) #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
#if !defined(NUM_SERVOS) || NUM_SERVOS < 4 // Try to use servo connector #if !defined(NUM_SERVOS) || NUM_SERVOS < 4 // Try to use servo connector
#define CASE_LIGHT_PIN P1_18 // (4) MUST BE HARDWARE PWM #define CASE_LIGHT_PIN P1_18 // (4) MUST BE HARDWARE PWM
#endif #endif
@ -210,11 +210,11 @@
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// Use servo pins, if available // Use servo pins, if available
// //
#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
#error "SPINDLE_LASER_ENABLE requires 3 free servo pins." #error "SPINDLE_LASER_ENABLE requires 3 free servo pins."
#endif #endif
#define SPINDLE_LASER_ENABLE_PIN SERVO1_PIN // (6) Pin should have a pullup/pulldown! #define SPINDLE_LASER_ENA_PIN SERVO1_PIN // (6) Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN SERVO3_PIN // (4) MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN SERVO3_PIN // (4) MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN SERVO2_PIN // (5) #define SPINDLE_DIR_PIN SERVO2_PIN // (5)
#endif #endif

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

@ -157,8 +157,8 @@
#ifndef SPINDLE_LASER_PWM_PIN #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 // MUST BE HARDWARE PWM. Pin 4 interrupts OC0* and OC1* always in use?
#endif #endif
#ifndef SPINDLE_LASER_ENABLE_PIN #ifndef SPINDLE_LASER_ENA_PIN
#define SPINDLE_LASER_ENABLE_PIN 14 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 14 // Pin should have a pullup!
#endif #endif
#ifndef SPINDLE_DIR_PIN #ifndef SPINDLE_DIR_PIN
#define SPINDLE_DIR_PIN 15 #define SPINDLE_DIR_PIN 15

6
Marlin/src/pins/pins_SANGUINOLOLU_11.h
View File

@ -279,7 +279,7 @@
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL) // try to use IO Header #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL) // try to use IO Header
#define SPINDLE_LASER_ENABLE_PIN 10 // Pin should have a pullup/pulldown! #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_PWM_PIN 4 // MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 11 #define SPINDLE_DIR_PIN 11
@ -307,7 +307,7 @@
* /RESET O| |O 1A * /RESET O| |O 1A
* /SLEEP O| |O 1B * /SLEEP O| |O 1B
* SPINDLE_LASER_PWM_PIN STEP O| |O VDD * SPINDLE_LASER_PWM_PIN STEP O| |O VDD
* SPINDLE_LASER_ENABLE_PIN DIR O| |O GND * SPINDLE_LASER_ENA_PIN DIR O| |O GND
* ------- * -------
* *
* Note: Socket names vary from vendor to vendor. * Note: Socket names vary from vendor to vendor.
@ -319,7 +319,7 @@
#define X_ENABLE_PIN 14 #define X_ENABLE_PIN 14
#define X_STEP_PIN 1 #define X_STEP_PIN 1
#define SPINDLE_LASER_PWM_PIN 15 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 15 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 21 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 21 // Pin should have a pullup!
#define SPINDLE_DIR_PIN -1 // No pin available on the socket for the direction pin #define SPINDLE_DIR_PIN -1 // No pin available on the socket for the direction pin
#endif #endif
#endif // SPINDLE_LASER_ENABLE #endif // SPINDLE_LASER_ENABLE

2
Marlin/src/pins/pins_SAV_MKI.h
View File

@ -176,7 +176,7 @@
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_PWM_PIN 24 // B4 PWM2A #define SPINDLE_LASER_PWM_PIN 24 // B4 PWM2A
#define SPINDLE_LASER_ENABLE_PIN 39 // F1 Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 39 // F1 Pin should have a pullup!
#define SPINDLE_DIR_PIN 40 // F2 #define SPINDLE_DIR_PIN 40 // F2
#define CASE_LIGHT_PIN 0 // D0 PWM0B #define CASE_LIGHT_PIN 0 // D0 PWM0B

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

@ -108,7 +108,7 @@
// Laser control // Laser control
#if ENABLED(SPINDLE_LASER_ENABLE) #if ENABLED(SPINDLE_LASER_ENABLE)
#define SPINDLE_LASER_PWM_PIN PB8 #define SPINDLE_LASER_PWM_PIN PB8
#define SPINDLE_LASER_ENABLE_PIN PD5 #define SPINDLE_LASER_ENA_PIN PD5
#endif #endif
// //

2
Marlin/src/pins/pins_TEENSY2.h
View File

@ -179,6 +179,6 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_ENABLE_PIN 5 // D5 Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 5 // D5 Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 0 // D0 PWM0B MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 0 // D0 PWM0B MUST BE HARDWARE PWM
#define SPINDLE_DIR_PIN 7 // D7 #define SPINDLE_DIR_PIN 7 // D7

2
Marlin/src/pins/pins_TEENSYLU.h
View File

@ -159,5 +159,5 @@
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_PWM_PIN 24 // B4 IO-3 PWM2A - MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 24 // B4 IO-3 PWM2A - MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 39 // F1 IO-11 - Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 39 // F1 IO-11 - Pin should have a pullup!
#define SPINDLE_DIR_PIN 40 // F2 IO-9 #define SPINDLE_DIR_PIN 40 // F2 IO-9

2
Marlin/src/pins/pins_ULTIMAIN_2.h
View File

@ -131,7 +131,7 @@
#if ENABLED(SPINDLE_LASER_ENABLE) // use the LED_PIN for spindle speed control or case light #if ENABLED(SPINDLE_LASER_ENABLE) // use the LED_PIN for spindle speed control or case light
#undef LED_PIN #undef LED_PIN
#define SPINDLE_DIR_PIN 16 #define SPINDLE_DIR_PIN 16
#define SPINDLE_LASER_ENABLE_PIN 17 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 17 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 8 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 8 // MUST BE HARDWARE PWM
#else #else
#undef LED_PIN #undef LED_PIN

2
Marlin/src/pins/pins_ULTIMAKER.h
View File

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

10
Marlin/src/pins/pins_ULTIMAKER_OLD.h
View File

@ -221,13 +221,13 @@
#define SPINDLE_DIR_PIN 10 // SW4 #define SPINDLE_DIR_PIN 10 // SW4
#define SPINDLE_LASER_PWM_PIN 9 // SW5 MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 9 // SW5 MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 8 // SW6 Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 8 // SW6 Pin should have a pullup!
#elif ENABLED(board_rev_1_5) // use the same pins - but now they are on a different connector #elif ENABLED(board_rev_1_5) // use the same pins - but now they are on a different connector
#define SPINDLE_DIR_PIN 10 // EXP3-6 (silkscreen says 10) #define SPINDLE_DIR_PIN 10 // EXP3-6 (silkscreen says 10)
#define SPINDLE_LASER_PWM_PIN 9 // EXP3-7 (silkscreen says 9) MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 9 // EXP3-7 (silkscreen says 9) MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 8 // EXP3-8 (silkscreen says 8) Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 8 // EXP3-8 (silkscreen says 8) Pin should have a pullup!
#elif ENABLED(board_rev_1_1_TO_1_3) #elif ENABLED(board_rev_1_1_TO_1_3)
@ -251,12 +251,12 @@
#define E0_ENABLE_PIN 48 #define E0_ENABLE_PIN 48
#define SPINDLE_DIR_PIN 43 #define SPINDLE_DIR_PIN 43
#define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 41 // Pin should have a pullup! #define SPINDLE_LASER_ENA_PIN 41 // Pin should have a pullup!
#elif TEMP_SENSOR_BED == 0 // Can't use E0 so see if HEATER_BED_PIN is available #elif TEMP_SENSOR_BED == 0 // Can't use E0 so see if HEATER_BED_PIN is available
#undef HEATER_BED_PIN #undef HEATER_BED_PIN
#define SPINDLE_DIR_PIN 38 // Probably pin 4 on 10 pin connector closest to the E0 socket #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_PWM_PIN 4 // MUST BE HARDWARE PWM - Special precautions usually needed.
#define SPINDLE_LASER_ENABLE_PIN 40 // Pin should have a pullup! (Probably pin 6 on the 10-pin #define SPINDLE_LASER_ENA_PIN 40 // Pin should have a pullup! (Probably pin 6 on the 10-pin
// connector closest to the E0 socket) // connector closest to the E0 socket)
#endif #endif
#endif #endif
@ -267,7 +267,7 @@
* *
* spindle signal socket name socket name * spindle signal socket name socket name
* ------- * -------
* SPINDLE_LASER_ENABLE_PIN /ENABLE *| |O VMOT * SPINDLE_LASER_ENA_PIN /ENABLE *| |O VMOT
* MS1 O| |O GND * MS1 O| |O GND
* MS2 O| |O 2B * MS2 O| |O 2B
* MS3 O| |O 2A * MS3 O| |O 2A

Write Preview
Loading…
Cancel
Save