Просмотр исходного кода

SPINDLE_LASER_ENABLE => SPINDLE_LASER_ENA

Scott Lahteine 6 лет назад
Родитель
Сommit
c8a83fb122
51 измененных файлов: 90 добавлений и 88 удалений
  1. 2
    2
      Marlin/src/HAL/HAL_AVR/SanityCheck.h
  2. 2
    2
      Marlin/src/HAL/HAL_LINUX/SanityCheck.h
  3. 2
    2
      Marlin/src/HAL/HAL_LPC1768/SanityCheck.h
  4. 2
    2
      Marlin/src/HAL/HAL_STM32/SanityCheck.h
  5. 2
    2
      Marlin/src/HAL/HAL_STM32F1/SanityCheck.h
  6. 2
    2
      Marlin/src/HAL/HAL_STM32F4/SanityCheck.h
  7. 2
    2
      Marlin/src/HAL/HAL_STM32F7/SanityCheck.h
  8. 1
    1
      Marlin/src/Marlin.cpp
  9. 6
    6
      Marlin/src/gcode/control/M3-M5.cpp
  10. 2
    0
      Marlin/src/inc/SanityCheck.h
  11. 2
    2
      Marlin/src/pins/pinsDebug_list.h
  12. 4
    4
      Marlin/src/pins/pins_3DRAG.h
  13. 2
    2
      Marlin/src/pins/pins_AZTEEG_X3.h
  14. 2
    2
      Marlin/src/pins/pins_AZTEEG_X3_PRO.h
  15. 1
    1
      Marlin/src/pins/pins_BAM_DICE_DUE.h
  16. 1
    1
      Marlin/src/pins/pins_BQ_ZUM_MEGA_3D.h
  17. 1
    1
      Marlin/src/pins/pins_COHESION3D_MINI.h
  18. 1
    1
      Marlin/src/pins/pins_COHESION3D_REMIX.h
  19. 1
    1
      Marlin/src/pins/pins_EINSY_RAMBO.h
  20. 1
    1
      Marlin/src/pins/pins_EINSY_RETRO.h
  21. 1
    1
      Marlin/src/pins/pins_FELIX2.h
  22. 4
    4
      Marlin/src/pins/pins_FORMBOT_RAPTOR2.h
  23. 1
    1
      Marlin/src/pins/pins_FORMBOT_TREX3.h
  24. 1
    1
      Marlin/src/pins/pins_GEN6.h
  25. 1
    1
      Marlin/src/pins/pins_GEN7_12.h
  26. 1
    1
      Marlin/src/pins/pins_GEN7_14.h
  27. 1
    1
      Marlin/src/pins/pins_GEN7_CUSTOM.h
  28. 1
    1
      Marlin/src/pins/pins_MEGACONTROLLER.h
  29. 1
    1
      Marlin/src/pins/pins_MEGATRONICS.h
  30. 1
    1
      Marlin/src/pins/pins_MEGATRONICS_2.h
  31. 2
    2
      Marlin/src/pins/pins_MEGATRONICS_3.h
  32. 1
    1
      Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
  33. 1
    1
      Marlin/src/pins/pins_MINIRAMBO.h
  34. 1
    1
      Marlin/src/pins/pins_MINITRONICS.h
  35. 1
    1
      Marlin/src/pins/pins_MKS_BASE.h
  36. 1
    1
      Marlin/src/pins/pins_MKS_BASE_14.h
  37. 1
    1
      Marlin/src/pins/pins_RAMBO.h
  38. 4
    4
      Marlin/src/pins/pins_RAMPS.h
  39. 2
    2
      Marlin/src/pins/pins_RAMPS_FD_V1.h
  40. 4
    4
      Marlin/src/pins/pins_RAMPS_LINUX.h
  41. 1
    1
      Marlin/src/pins/pins_RAMPS_OLD.h
  42. 3
    3
      Marlin/src/pins/pins_RAMPS_RE_ARM.h
  43. 2
    2
      Marlin/src/pins/pins_RUMBA.h
  44. 3
    3
      Marlin/src/pins/pins_SANGUINOLOLU_11.h
  45. 1
    1
      Marlin/src/pins/pins_SAV_MKI.h
  46. 1
    1
      Marlin/src/pins/pins_STM3R_MINI.h
  47. 1
    1
      Marlin/src/pins/pins_TEENSY2.h
  48. 1
    1
      Marlin/src/pins/pins_TEENSYLU.h
  49. 1
    1
      Marlin/src/pins/pins_ULTIMAIN_2.h
  50. 1
    1
      Marlin/src/pins/pins_ULTIMAKER.h
  51. 5
    5
      Marlin/src/pins/pins_ULTIMAKER_OLD.h

+ 2
- 2
Marlin/src/HAL/HAL_AVR/SanityCheck.h Просмотреть файл

46
  * Sanity checks for Spindle / Laser
46
  * Sanity checks for Spindle / Laser
47
  */
47
  */
48
 #if ENABLED(SPINDLE_LASER_ENABLE)
48
 #if ENABLED(SPINDLE_LASER_ENABLE)
49
-  #if !PIN_EXISTS(SPINDLE_LASER_ENABLE)
50
-    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN."
49
+  #if !PIN_EXISTS(SPINDLE_LASER_ENA)
50
+    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
51
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
51
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
52
     #error "SPINDLE_DIR_PIN not defined."
52
     #error "SPINDLE_DIR_PIN not defined."
53
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)
53
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

+ 2
- 2
Marlin/src/HAL/HAL_LINUX/SanityCheck.h Просмотреть файл

25
  */
25
  */
26
 
26
 
27
 #if ENABLED(SPINDLE_LASER_ENABLE)
27
 #if ENABLED(SPINDLE_LASER_ENABLE)
28
-  #if !PIN_EXISTS(SPINDLE_LASER_ENABLE)
29
-    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN."
28
+  #if !PIN_EXISTS(SPINDLE_LASER_ENA)
29
+    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
30
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
30
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
31
     #error "SPINDLE_DIR_PIN not defined."
31
     #error "SPINDLE_DIR_PIN not defined."
32
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)
32
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

+ 2
- 2
Marlin/src/HAL/HAL_LPC1768/SanityCheck.h Просмотреть файл

25
  */
25
  */
26
 
26
 
27
 #if ENABLED(SPINDLE_LASER_ENABLE)
27
 #if ENABLED(SPINDLE_LASER_ENABLE)
28
-  #if !PIN_EXISTS(SPINDLE_LASER_ENABLE)
29
-    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN."
28
+  #if !PIN_EXISTS(SPINDLE_LASER_ENA)
29
+    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
30
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
30
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
31
     #error "SPINDLE_DIR_PIN not defined."
31
     #error "SPINDLE_DIR_PIN not defined."
32
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)
32
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

+ 2
- 2
Marlin/src/HAL/HAL_STM32/SanityCheck.h Просмотреть файл

25
  * Test Re-ARM specific configuration values for errors at compile-time.
25
  * Test Re-ARM specific configuration values for errors at compile-time.
26
  */
26
  */
27
 #if ENABLED(SPINDLE_LASER_ENABLE)
27
 #if ENABLED(SPINDLE_LASER_ENABLE)
28
-  #if !PIN_EXISTS(SPINDLE_LASER_ENABLE)
29
-    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN."
28
+  #if !PIN_EXISTS(SPINDLE_LASER_ENA)
29
+    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
30
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
30
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
31
     #error "SPINDLE_DIR_PIN not defined."
31
     #error "SPINDLE_DIR_PIN not defined."
32
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)
32
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

+ 2
- 2
Marlin/src/HAL/HAL_STM32F1/SanityCheck.h Просмотреть файл

28
  * Test Re-ARM specific configuration values for errors at compile-time.
28
  * Test Re-ARM specific configuration values for errors at compile-time.
29
  */
29
  */
30
 #if ENABLED(SPINDLE_LASER_ENABLE)
30
 #if ENABLED(SPINDLE_LASER_ENABLE)
31
-  #if !PIN_EXISTS(SPINDLE_LASER_ENABLE)
32
-    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN."
31
+  #if !PIN_EXISTS(SPINDLE_LASER_ENA)
32
+    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
33
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
33
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
34
     #error "SPINDLE_DIR_PIN not defined."
34
     #error "SPINDLE_DIR_PIN not defined."
35
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)
35
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

+ 2
- 2
Marlin/src/HAL/HAL_STM32F4/SanityCheck.h Просмотреть файл

24
  * Test Re-ARM specific configuration values for errors at compile-time.
24
  * Test Re-ARM specific configuration values for errors at compile-time.
25
  */
25
  */
26
 #if ENABLED(SPINDLE_LASER_ENABLE)
26
 #if ENABLED(SPINDLE_LASER_ENABLE)
27
-  #if !PIN_EXISTS(SPINDLE_LASER_ENABLE)
28
-    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN."
27
+  #if !PIN_EXISTS(SPINDLE_LASER_ENA)
28
+    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
29
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
29
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
30
     #error "SPINDLE_DIR_PIN not defined."
30
     #error "SPINDLE_DIR_PIN not defined."
31
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)
31
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

+ 2
- 2
Marlin/src/HAL/HAL_STM32F7/SanityCheck.h Просмотреть файл

24
  * Test Re-ARM specific configuration values for errors at compile-time.
24
  * Test Re-ARM specific configuration values for errors at compile-time.
25
  */
25
  */
26
 #if ENABLED(SPINDLE_LASER_ENABLE)
26
 #if ENABLED(SPINDLE_LASER_ENABLE)
27
-  #if !PIN_EXISTS(SPINDLE_LASER_ENABLE)
28
-    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENABLE_PIN."
27
+  #if !PIN_EXISTS(SPINDLE_LASER_ENA)
28
+    #error "SPINDLE_LASER_ENABLE requires SPINDLE_LASER_ENA_PIN."
29
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
29
   #elif SPINDLE_DIR_CHANGE && !PIN_EXISTS(SPINDLE_DIR)
30
     #error "SPINDLE_DIR_PIN not defined."
30
     #error "SPINDLE_DIR_PIN not defined."
31
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)
31
   #elif ENABLED(SPINDLE_LASER_PWM) && PIN_EXISTS(SPINDLE_LASER_PWM)

+ 1
- 1
Marlin/src/Marlin.cpp Просмотреть файл

975
   #endif
975
   #endif
976
 
976
 
977
   #if ENABLED(SPINDLE_LASER_ENABLE)
977
   #if ENABLED(SPINDLE_LASER_ENABLE)
978
-    OUT_WRITE(SPINDLE_LASER_ENABLE_PIN, !SPINDLE_LASER_ENABLE_INVERT);  // init spindle to off
978
+    OUT_WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ENABLE_INVERT);  // init spindle to off
979
     #if SPINDLE_DIR_CHANGE
979
     #if SPINDLE_DIR_CHANGE
980
       OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR ? 255 : 0);  // init rotation to clockwise (M3)
980
       OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR ? 255 : 0);  // init rotation to clockwise (M3)
981
     #endif
981
     #endif

+ 6
- 6
Marlin/src/gcode/control/M3-M5.cpp Просмотреть файл

53
  * NOTE: A minimum PWM frequency of 50 Hz is needed. All prescaler
53
  * NOTE: A minimum PWM frequency of 50 Hz is needed. All prescaler
54
  *       factors for timers 2, 3, 4, and 5 are acceptable.
54
  *       factors for timers 2, 3, 4, and 5 are acceptable.
55
  *
55
  *
56
- *  SPINDLE_LASER_ENABLE_PIN needs an external pullup or it may power on
56
+ *  SPINDLE_LASER_ENA_PIN needs an external pullup or it may power on
57
  *  the spindle/laser during power-up or when connecting to the host
57
  *  the spindle/laser during power-up or when connecting to the host
58
  *  (usually goes through a reset which sets all I/O pins to tri-state)
58
  *  (usually goes through a reset which sets all I/O pins to tri-state)
59
  *
59
  *
73
  */
73
  */
74
 
74
 
75
 inline void set_spindle_laser_ocr(const uint8_t ocr) {
75
 inline void set_spindle_laser_ocr(const uint8_t ocr) {
76
-  WRITE(SPINDLE_LASER_ENABLE_PIN, SPINDLE_LASER_ENABLE_INVERT); // turn spindle on (active low)
76
+  WRITE(SPINDLE_LASER_ENA_PIN, SPINDLE_LASER_ENABLE_INVERT); // turn spindle on (active low)
77
   analogWrite(SPINDLE_LASER_PWM_PIN, (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr);
77
   analogWrite(SPINDLE_LASER_PWM_PIN, (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr);
78
 }
78
 }
79
 
79
 
81
 
81
 
82
   void update_spindle_laser_power() {
82
   void update_spindle_laser_power() {
83
     if (spindle_laser_power == 0) {
83
     if (spindle_laser_power == 0) {
84
-      WRITE(SPINDLE_LASER_ENABLE_PIN, !SPINDLE_LASER_ENABLE_INVERT);                      // turn spindle off (active low)
84
+      WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ENABLE_INVERT);                      // turn spindle off (active low)
85
       analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0);             // only write low byte
85
       analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0);             // only write low byte
86
       delay_for_power_down();
86
       delay_for_power_down();
87
     }
87
     }
101
 #endif // SPINDLE_LASER_PWM
101
 #endif // SPINDLE_LASER_PWM
102
 
102
 
103
 bool spindle_laser_enabled() {
103
 bool spindle_laser_enabled() {
104
-  return !!spindle_laser_power; // READ(SPINDLE_LASER_ENABLE_PIN) == SPINDLE_LASER_ENABLE_INVERT;
104
+  return !!spindle_laser_power; // READ(SPINDLE_LASER_ENA_PIN) == SPINDLE_LASER_ENABLE_INVERT;
105
 }
105
 }
106
 
106
 
107
 void set_spindle_laser_enabled(const bool enable) {
107
 void set_spindle_laser_enabled(const bool enable) {
111
     update_spindle_laser_power();
111
     update_spindle_laser_power();
112
   #else
112
   #else
113
     if (enable) {
113
     if (enable) {
114
-      WRITE(SPINDLE_LASER_ENABLE_PIN, SPINDLE_LASER_ENABLE_INVERT);
114
+      WRITE(SPINDLE_LASER_ENA_PIN, SPINDLE_LASER_ENABLE_INVERT);
115
       delay_for_power_up();
115
       delay_for_power_up();
116
     }
116
     }
117
     else {
117
     else {
118
-      WRITE(SPINDLE_LASER_ENABLE_PIN, !SPINDLE_LASER_ENABLE_INVERT);
118
+      WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ENABLE_INVERT);
119
       delay_for_power_down();
119
       delay_for_power_down();
120
     }
120
     }
121
   #endif
121
   #endif

+ 2
- 0
Marlin/src/inc/SanityCheck.h Просмотреть файл

341
   #error "MAX6675_SS is now MAX6675_SS_PIN. Please update your configuration and/or pins."
341
   #error "MAX6675_SS is now MAX6675_SS_PIN. Please update your configuration and/or pins."
342
 #elif defined(MAX6675_SS2)
342
 #elif defined(MAX6675_SS2)
343
   #error "MAX6675_SS2 is now MAX6675_SS2_PIN. Please update your configuration and/or pins."
343
   #error "MAX6675_SS2 is now MAX6675_SS2_PIN. Please update your configuration and/or pins."
344
+#elif defined(SPINDLE_LASER_ENABLE_PIN)
345
+  #error "SPINDLE_LASER_ENABLE_PIN is now SPINDLE_LASER_ENA_PIN. Please update your configuration and/or pins."
344
 #elif defined(TMC_Z_CALIBRATION)
346
 #elif defined(TMC_Z_CALIBRATION)
345
   #error "TMC_Z_CALIBRATION has been deprecated in favor of Z_STEPPER_AUTO_ALIGN. Please update your configuration."
347
   #error "TMC_Z_CALIBRATION has been deprecated in favor of Z_STEPPER_AUTO_ALIGN. Please update your configuration."
346
 #elif defined(Z_MIN_PROBE_ENDSTOP)
348
 #elif defined(Z_MIN_PROBE_ENDSTOP)

+ 2
- 2
Marlin/src/pins/pinsDebug_list.h Просмотреть файл

788
 #if PIN_EXISTS(SPINDLE_ENABLE)
788
 #if PIN_EXISTS(SPINDLE_ENABLE)
789
   REPORT_NAME_DIGITAL(__LINE__, SPINDLE_ENABLE_PIN)
789
   REPORT_NAME_DIGITAL(__LINE__, SPINDLE_ENABLE_PIN)
790
 #endif
790
 #endif
791
-#if PIN_EXISTS(SPINDLE_LASER_ENABLE)
792
-  REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_ENABLE_PIN)
791
+#if PIN_EXISTS(SPINDLE_LASER_ENA)
792
+  REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_ENA_PIN)
793
 #endif
793
 #endif
794
 #if PIN_EXISTS(SPINDLE_LASER_PWM)
794
 #if PIN_EXISTS(SPINDLE_LASER_PWM)
795
   REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_PWM_PIN)
795
   REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_PWM_PIN)

+ 4
- 4
Marlin/src/pins/pins_3DRAG.h Просмотреть файл

124
  *
124
  *
125
  *      stepper signal           socket name       socket name
125
  *      stepper signal           socket name       socket name
126
  *                                          -------
126
  *                                          -------
127
- *       SPINDLE_LASER_ENABLE_PIN /ENABLE  O|     |O  VMOT
127
+ *       SPINDLE_LASER_ENA_PIN    /ENABLE  O|     |O  VMOT
128
  *                                    MS1  O|     |O  GND
128
  *                                    MS1  O|     |O  GND
129
  *                                    MS2  O|     |O  2B
129
  *                                    MS2  O|     |O  2B
130
  *                                    MS3  O|     |O  2A
130
  *                                    MS3  O|     |O  2A
137
  *  Note: Socket names vary from vendor to vendor
137
  *  Note: Socket names vary from vendor to vendor
138
  */
138
  */
139
 #undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are not good with 3DRAG
139
 #undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are not good with 3DRAG
140
-#undef SPINDLE_LASER_ENABLE_PIN
140
+#undef SPINDLE_LASER_ENA_PIN
141
 #undef SPINDLE_DIR_PIN
141
 #undef SPINDLE_DIR_PIN
142
 
142
 
143
 #if ENABLED(SPINDLE_LASER_ENABLE)
143
 #if ENABLED(SPINDLE_LASER_ENABLE)
152
     #define Z_ENABLE_PIN             24
152
     #define Z_ENABLE_PIN             24
153
     #define Z_STEP_PIN               26
153
     #define Z_STEP_PIN               26
154
     #define SPINDLE_LASER_PWM_PIN    46   // MUST BE HARDWARE PWM
154
     #define SPINDLE_LASER_PWM_PIN    46   // MUST BE HARDWARE PWM
155
-    #define SPINDLE_LASER_ENABLE_PIN 62   // Pin should have a pullup!
155
+    #define SPINDLE_LASER_ENA_PIN    62   // Pin should have a pullup!
156
     #define SPINDLE_DIR_PIN          48
156
     #define SPINDLE_DIR_PIN          48
157
   #elif !BOTH(ULTRA_LCD, NEWPANEL)     // use expansion header if no LCD in use
157
   #elif !BOTH(ULTRA_LCD, NEWPANEL)     // use expansion header if no LCD in use
158
-    #define SPINDLE_LASER_ENABLE_PIN 16   // Pin should have a pullup/pulldown!
158
+    #define SPINDLE_LASER_ENA_PIN    16   // Pin should have a pullup/pulldown!
159
     #define SPINDLE_DIR_PIN          17
159
     #define SPINDLE_DIR_PIN          17
160
   #endif
160
   #endif
161
 #endif
161
 #endif

+ 2
- 2
Marlin/src/pins/pins_AZTEEG_X3.h Просмотреть файл

83
 // M3/M4/M5 - Spindle/Laser Control
83
 // M3/M4/M5 - Spindle/Laser Control
84
 //
84
 //
85
 #undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
85
 #undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
86
-#undef SPINDLE_LASER_ENABLE_PIN
86
+#undef SPINDLE_LASER_ENA_PIN
87
 #undef SPINDLE_DIR_PIN
87
 #undef SPINDLE_DIR_PIN
88
 
88
 
89
 #if ENABLED(SPINDLE_LASER_ENABLE)
89
 #if ENABLED(SPINDLE_LASER_ENABLE)
94
     #define SERVO0_PIN     11
94
     #define SERVO0_PIN     11
95
   #endif
95
   #endif
96
   #define SPINDLE_LASER_PWM_PIN     7   // MUST BE HARDWARE PWM
96
   #define SPINDLE_LASER_PWM_PIN     7   // MUST BE HARDWARE PWM
97
-  #define SPINDLE_LASER_ENABLE_PIN 20   // Pin should have a pullup!
97
+  #define SPINDLE_LASER_ENA_PIN    20   // Pin should have a pullup!
98
   #define SPINDLE_DIR_PIN          21
98
   #define SPINDLE_DIR_PIN          21
99
 #endif
99
 #endif

+ 2
- 2
Marlin/src/pins/pins_AZTEEG_X3_PRO.h Просмотреть файл

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

+ 1
- 1
Marlin/src/pins/pins_BAM_DICE_DUE.h Просмотреть файл

33
 //
33
 //
34
 // M3/M4/M5 - Spindle/Laser Control
34
 // M3/M4/M5 - Spindle/Laser Control
35
 //
35
 //
36
-#define SPINDLE_LASER_ENABLE_PIN 66   // Pin should have a pullup/pulldown!
36
+#define SPINDLE_LASER_ENA_PIN    66   // Pin should have a pullup/pulldown!
37
 #define SPINDLE_DIR_PIN          67
37
 #define SPINDLE_DIR_PIN          67
38
 #define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
38
 #define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
39
 
39
 

+ 1
- 1
Marlin/src/pins/pins_BQ_ZUM_MEGA_3D.h Просмотреть файл

49
 //
49
 //
50
 // M3/M4/M5 - Spindle/Laser Control
50
 // M3/M4/M5 - Spindle/Laser Control
51
 //
51
 //
52
-#define SPINDLE_LASER_ENABLE_PIN 40   // Pin should have a pullup/pulldown!
52
+#define SPINDLE_LASER_ENA_PIN    40   // Pin should have a pullup/pulldown!
53
 #define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
53
 #define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
54
 #define SPINDLE_DIR_PIN          42
54
 #define SPINDLE_DIR_PIN          42
55
 
55
 

+ 1
- 1
Marlin/src/pins/pins_COHESION3D_MINI.h Просмотреть файл

118
 //
118
 //
119
 #if ENABLED(SPINDLE_LASER_ENABLE)
119
 #if ENABLED(SPINDLE_LASER_ENABLE)
120
   #undef HEATER_0_PIN
120
   #undef HEATER_0_PIN
121
-  #define SPINDLE_LASER_ENABLE_PIN  P2_07   // FET 1
121
+  #define SPINDLE_LASER_ENA_PIN     P2_07   // FET 1
122
   #undef HEATER_BED_PIN
122
   #undef HEATER_BED_PIN
123
   #define SPINDLE_LASER_PWM_PIN     P2_05   // Bed FET
123
   #define SPINDLE_LASER_PWM_PIN     P2_05   // Bed FET
124
   #undef FAN_PIN
124
   #undef FAN_PIN

+ 1
- 1
Marlin/src/pins/pins_COHESION3D_REMIX.h Просмотреть файл

139
 //
139
 //
140
 #if ENABLED(SPINDLE_LASER_ENABLE)
140
 #if ENABLED(SPINDLE_LASER_ENABLE)
141
   #undef HEATER_0_PIN
141
   #undef HEATER_0_PIN
142
-  #define SPINDLE_LASER_ENABLE_PIN  P2_07   // FET 1
142
+  #define SPINDLE_LASER_ENA_PIN     P2_07   // FET 1
143
   #undef HEATER_BED_PIN
143
   #undef HEATER_BED_PIN
144
   #define SPINDLE_LASER_PWM_PIN     P2_05   // Bed FET
144
   #define SPINDLE_LASER_PWM_PIN     P2_05   // Bed FET
145
   #undef FAN_PIN
145
   #undef FAN_PIN

+ 1
- 1
Marlin/src/pins/pins_EINSY_RAMBO.h Просмотреть файл

135
 //
135
 //
136
 // use P1 connector for spindle pins
136
 // use P1 connector for spindle pins
137
 #define SPINDLE_LASER_PWM_PIN     9   // MUST BE HARDWARE PWM
137
 #define SPINDLE_LASER_PWM_PIN     9   // MUST BE HARDWARE PWM
138
-#define SPINDLE_LASER_ENABLE_PIN 18   // Pin should have a pullup!
138
+#define SPINDLE_LASER_ENA_PIN    18   // Pin should have a pullup!
139
 #define SPINDLE_DIR_PIN          19
139
 #define SPINDLE_DIR_PIN          19
140
 
140
 
141
 //
141
 //

+ 1
- 1
Marlin/src/pins/pins_EINSY_RETRO.h Просмотреть файл

149
 //
149
 //
150
 // use P1 connector for spindle pins
150
 // use P1 connector for spindle pins
151
 #define SPINDLE_LASER_PWM_PIN     9   // MUST BE HARDWARE PWM
151
 #define SPINDLE_LASER_PWM_PIN     9   // MUST BE HARDWARE PWM
152
-#define SPINDLE_LASER_ENABLE_PIN 18   // Pin should have a pullup!
152
+#define SPINDLE_LASER_ENA_PIN    18   // Pin should have a pullup!
153
 #define SPINDLE_DIR_PIN          19
153
 #define SPINDLE_DIR_PIN          19
154
 
154
 
155
 //
155
 //

+ 1
- 1
Marlin/src/pins/pins_FELIX2.h Просмотреть файл

59
 // M3/M4/M5 - Spindle/Laser Control
59
 // M3/M4/M5 - Spindle/Laser Control
60
 //
60
 //
61
 #undef SPINDLE_LASER_PWM_PIN     // Definitions in pins_RAMPS.h are not valid with this board
61
 #undef SPINDLE_LASER_PWM_PIN     // Definitions in pins_RAMPS.h are not valid with this board
62
-#undef SPINDLE_LASER_ENABLE_PIN
62
+#undef SPINDLE_LASER_ENA_PIN
63
 #undef SPINDLE_DIR_PIN
63
 #undef SPINDLE_DIR_PIN

+ 4
- 4
Marlin/src/pins/pins_FORMBOT_RAPTOR2.h Просмотреть файл

40
 //
40
 //
41
 // M3/M4/M5 - Spindle/Laser Control
41
 // M3/M4/M5 - Spindle/Laser Control
42
 //
42
 //
43
-#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
43
+#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
44
   #if !NUM_SERVOS                       // Try to use servo connector first
44
   #if !NUM_SERVOS                       // Try to use servo connector first
45
-    #define SPINDLE_LASER_ENABLE_PIN  6 // Pin should have a pullup/pulldown!
45
+    #define SPINDLE_LASER_ENA_PIN     6 // Pin should have a pullup/pulldown!
46
     #define SPINDLE_LASER_PWM_PIN     4 // MUST BE HARDWARE PWM
46
     #define SPINDLE_LASER_PWM_PIN     4 // MUST BE HARDWARE PWM
47
     #define SPINDLE_DIR_PIN           5
47
     #define SPINDLE_DIR_PIN           5
48
   #elif !GREEDY_PANEL                   // Try to use AUX2
48
   #elif !GREEDY_PANEL                   // Try to use AUX2
49
-    #define SPINDLE_LASER_ENABLE_PIN 40 // Pin should have a pullup/pulldown!
49
+    #define SPINDLE_LASER_ENA_PIN    40 // Pin should have a pullup/pulldown!
50
     #define SPINDLE_LASER_PWM_PIN    44 // MUST BE HARDWARE PWM
50
     #define SPINDLE_LASER_PWM_PIN    44 // MUST BE HARDWARE PWM
51
     #define SPINDLE_DIR_PIN          65
51
     #define SPINDLE_DIR_PIN          65
52
   #endif
52
   #endif
62
 
62
 
63
 #undef GREEDY_PANEL
63
 #undef GREEDY_PANEL
64
 
64
 
65
-#if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && (CASE_LIGHT_PIN == SPINDLE_LASER_ENABLE_PIN || CASE_LIGHT_PIN == SPINDLE_LASER_PWM_PIN)
65
+#if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && (CASE_LIGHT_PIN == SPINDLE_LASER_ENA_PIN || CASE_LIGHT_PIN == SPINDLE_LASER_PWM_PIN)
66
   #error "CASE_LIGHT_PIN conflicts with a Spindle / Laser pin."
66
   #error "CASE_LIGHT_PIN conflicts with a Spindle / Laser pin."
67
 #endif
67
 #endif

+ 1
- 1
Marlin/src/pins/pins_FORMBOT_TREX3.h Просмотреть файл

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

+ 1
- 1
Marlin/src/pins/pins_GEN6.h Просмотреть файл

114
 //
114
 //
115
 // M3/M4/M5 - Spindle/Laser Control
115
 // M3/M4/M5 - Spindle/Laser Control
116
 //
116
 //
117
-#define SPINDLE_LASER_ENABLE_PIN  5   // Pin should have a pullup/pulldown!
117
+#define SPINDLE_LASER_ENA_PIN     5   // Pin should have a pullup/pulldown!
118
 #define SPINDLE_LASER_PWM_PIN    16   // MUST BE HARDWARE PWM
118
 #define SPINDLE_LASER_PWM_PIN    16   // MUST BE HARDWARE PWM
119
 #define SPINDLE_DIR_PIN           6
119
 #define SPINDLE_DIR_PIN           6

+ 1
- 1
Marlin/src/pins/pins_GEN7_12.h Просмотреть файл

140
 //
140
 //
141
 // M3/M4/M5 - Spindle/Laser Control
141
 // M3/M4/M5 - Spindle/Laser Control
142
 //
142
 //
143
-#define SPINDLE_LASER_ENABLE_PIN 10   // Pin should have a pullup/pulldown!
143
+#define SPINDLE_LASER_ENA_PIN    10   // Pin should have a pullup/pulldown!
144
 #define SPINDLE_DIR_PIN          11
144
 #define SPINDLE_DIR_PIN          11
145
 #if GEN7_VERSION < 13
145
 #if GEN7_VERSION < 13
146
   #define SPINDLE_LASER_PWM_PIN  16   // MUST BE HARDWARE PWM
146
   #define SPINDLE_LASER_PWM_PIN  16   // MUST BE HARDWARE PWM

+ 1
- 1
Marlin/src/pins/pins_GEN7_14.h Просмотреть файл

113
 //
113
 //
114
 // M3/M4/M5 - Spindle/Laser Control
114
 // M3/M4/M5 - Spindle/Laser Control
115
 //
115
 //
116
-#define SPINDLE_LASER_ENABLE_PIN 20   // Pin should have a pullup/pulldown!
116
+#define SPINDLE_LASER_ENA_PIN    20   // Pin should have a pullup/pulldown!
117
 #define SPINDLE_LASER_PWM_PIN    16   // MUST BE HARDWARE PWM
117
 #define SPINDLE_LASER_PWM_PIN    16   // MUST BE HARDWARE PWM
118
 #define SPINDLE_DIR_PIN          21
118
 #define SPINDLE_DIR_PIN          21

+ 1
- 1
Marlin/src/pins/pins_GEN7_CUSTOM.h Просмотреть файл

133
 //
133
 //
134
 // M3/M4/M5 - Spindle/Laser Control
134
 // M3/M4/M5 - Spindle/Laser Control
135
 //
135
 //
136
-#define SPINDLE_LASER_ENABLE_PIN  5   // Pin should have a pullup/pulldown!
136
+#define SPINDLE_LASER_ENA_PIN     5   // Pin should have a pullup/pulldown!
137
 #define SPINDLE_LASER_PWM_PIN    16   // MUST BE HARDWARE PWM
137
 #define SPINDLE_LASER_PWM_PIN    16   // MUST BE HARDWARE PWM
138
 #define SPINDLE_DIR_PIN           6
138
 #define SPINDLE_DIR_PIN           6

+ 1
- 1
Marlin/src/pins/pins_MEGACONTROLLER.h Просмотреть файл

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

+ 1
- 1
Marlin/src/pins/pins_MEGATRONICS.h Просмотреть файл

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

+ 1
- 1
Marlin/src/pins/pins_MEGATRONICS_2.h Просмотреть файл

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

+ 2
- 2
Marlin/src/pins/pins_MEGATRONICS_3.h Просмотреть файл

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

+ 1
- 1
Marlin/src/pins/pins_MIGHTYBOARD_REVE.h Просмотреть файл

263
 //
263
 //
264
 // M3/M4/M5 - Spindle/Laser Control
264
 // M3/M4/M5 - Spindle/Laser Control
265
 //
265
 //
266
-#define SPINDLE_LASER_ENABLE_PIN 66   // K4   Pin should have a pullup!
266
+#define SPINDLE_LASER_ENA_PIN    66   // K4   Pin should have a pullup!
267
 #define SPINDLE_LASER_PWM_PIN     8   // H5   MUST BE HARDWARE PWM
267
 #define SPINDLE_LASER_PWM_PIN     8   // H5   MUST BE HARDWARE PWM
268
 #define SPINDLE_DIR_PIN          67   // K5
268
 #define SPINDLE_DIR_PIN          67   // K5
269
 
269
 

+ 1
- 1
Marlin/src/pins/pins_MINIRAMBO.h Просмотреть файл

125
 //
125
 //
126
 // use P1 connector for spindle pins
126
 // use P1 connector for spindle pins
127
 #define SPINDLE_LASER_PWM_PIN     9   // MUST BE HARDWARE PWM
127
 #define SPINDLE_LASER_PWM_PIN     9   // MUST BE HARDWARE PWM
128
-#define SPINDLE_LASER_ENABLE_PIN 18   // Pin should have a pullup!
128
+#define SPINDLE_LASER_ENA_PIN    18   // Pin should have a pullup!
129
 #define SPINDLE_DIR_PIN          19
129
 #define SPINDLE_DIR_PIN          19
130
 
130
 
131
 //
131
 //

+ 1
- 1
Marlin/src/pins/pins_MINITRONICS.h Просмотреть файл

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

+ 1
- 1
Marlin/src/pins/pins_MKS_BASE.h Просмотреть файл

44
 // M3/M4/M5 - Spindle/Laser Control
44
 // M3/M4/M5 - Spindle/Laser Control
45
 //
45
 //
46
 #define SPINDLE_LASER_PWM_PIN     2   // MUST BE HARDWARE PWM
46
 #define SPINDLE_LASER_PWM_PIN     2   // MUST BE HARDWARE PWM
47
-#define SPINDLE_LASER_ENABLE_PIN 15   // Pin should have a pullup!
47
+#define SPINDLE_LASER_ENA_PIN    15   // Pin should have a pullup!
48
 #define SPINDLE_DIR_PIN          19
48
 #define SPINDLE_DIR_PIN          19
49
 
49
 
50
 #include "pins_RAMPS.h"
50
 #include "pins_RAMPS.h"

+ 1
- 1
Marlin/src/pins/pins_MKS_BASE_14.h Просмотреть файл

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

+ 1
- 1
Marlin/src/pins/pins_RAMBO.h Просмотреть файл

149
 // M3/M4/M5 - Spindle/Laser Control
149
 // M3/M4/M5 - Spindle/Laser Control
150
 //
150
 //
151
 #define SPINDLE_LASER_PWM_PIN    45   // MUST BE HARDWARE PWM
151
 #define SPINDLE_LASER_PWM_PIN    45   // MUST BE HARDWARE PWM
152
-#define SPINDLE_LASER_ENABLE_PIN 31   // Pin should have a pullup!
152
+#define SPINDLE_LASER_ENA_PIN    31   // Pin should have a pullup!
153
 #define SPINDLE_DIR_PIN          32
153
 #define SPINDLE_DIR_PIN          32
154
 
154
 
155
 //
155
 //

+ 4
- 4
Marlin/src/pins/pins_RAMPS.h Просмотреть файл

231
   #define PS_ON_PIN        12
231
   #define PS_ON_PIN        12
232
 #endif
232
 #endif
233
 
233
 
234
-#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENABLE_PIN)
234
+#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
235
   #if NUM_SERVOS <= 1 // try to use servo connector first
235
   #if NUM_SERVOS <= 1 // try to use servo connector first
236
     #define CASE_LIGHT_PIN    6   // MUST BE HARDWARE PWM
236
     #define CASE_LIGHT_PIN    6   // MUST BE HARDWARE PWM
237
   #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))  // try to use AUX 2
237
   #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))  // try to use AUX 2
242
 //
242
 //
243
 // M3/M4/M5 - Spindle/Laser Control
243
 // M3/M4/M5 - Spindle/Laser Control
244
 //
244
 //
245
-#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
245
+#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
246
   #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
246
   #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
247
-    #define SPINDLE_LASER_ENABLE_PIN  4   // Pin should have a pullup/pulldown!
247
+    #define SPINDLE_LASER_ENA_PIN     4   // Pin should have a pullup/pulldown!
248
     #define SPINDLE_LASER_PWM_PIN     6   // MUST BE HARDWARE PWM
248
     #define SPINDLE_LASER_PWM_PIN     6   // MUST BE HARDWARE PWM
249
     #define SPINDLE_DIR_PIN           5
249
     #define SPINDLE_DIR_PIN           5
250
   #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))  // try to use AUX 2
250
   #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))  // try to use AUX 2
251
-    #define SPINDLE_LASER_ENABLE_PIN 40   // Pin should have a pullup/pulldown!
251
+    #define SPINDLE_LASER_ENA_PIN    40   // Pin should have a pullup/pulldown!
252
     #define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
252
     #define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
253
     #define SPINDLE_DIR_PIN          65
253
     #define SPINDLE_DIR_PIN          65
254
   #endif
254
   #endif

+ 2
- 2
Marlin/src/pins/pins_RAMPS_FD_V1.h Просмотреть файл

198
 //
198
 //
199
 // M3/M4/M5 - Spindle/Laser Control
199
 // M3/M4/M5 - Spindle/Laser Control
200
 //
200
 //
201
-#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
201
+#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
202
   #if HOTENDS < 3
202
   #if HOTENDS < 3
203
-    #define SPINDLE_LASER_ENABLE_PIN  45   // Use E2 ENA
203
+    #define SPINDLE_LASER_ENA_PIN     45   // Use E2 ENA
204
     #define SPINDLE_LASER_PWM_PIN     12   // MUST BE HARDWARE PWM
204
     #define SPINDLE_LASER_PWM_PIN     12   // MUST BE HARDWARE PWM
205
     #define SPINDLE_DIR_PIN           47   // Use E2 DIR
205
     #define SPINDLE_DIR_PIN           47   // Use E2 DIR
206
   #endif
206
   #endif

+ 4
- 4
Marlin/src/pins/pins_RAMPS_LINUX.h Просмотреть файл

217
   #define PS_ON_PIN        12
217
   #define PS_ON_PIN        12
218
 #endif
218
 #endif
219
 
219
 
220
-#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENABLE_PIN)
220
+#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
221
   #if NUM_SERVOS <= 1 // try to use servo connector first
221
   #if NUM_SERVOS <= 1 // try to use servo connector first
222
     #define CASE_LIGHT_PIN    6   // MUST BE HARDWARE PWM
222
     #define CASE_LIGHT_PIN    6   // MUST BE HARDWARE PWM
223
   #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))  // try to use AUX 2
223
   #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))  // try to use AUX 2
228
 //
228
 //
229
 // M3/M4/M5 - Spindle/Laser Control
229
 // M3/M4/M5 - Spindle/Laser Control
230
 //
230
 //
231
-#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
231
+#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
232
   #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
232
   #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
233
-    #define SPINDLE_LASER_ENABLE_PIN  4   // Pin should have a pullup/pulldown!
233
+    #define SPINDLE_LASER_ENA_PIN     4   // Pin should have a pullup/pulldown!
234
     #define SPINDLE_LASER_PWM_PIN     6   // MUST BE HARDWARE PWM
234
     #define SPINDLE_LASER_PWM_PIN     6   // MUST BE HARDWARE PWM
235
     #define SPINDLE_DIR_PIN           5
235
     #define SPINDLE_DIR_PIN           5
236
   #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))  // try to use AUX 2
236
   #elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))  // try to use AUX 2
237
-    #define SPINDLE_LASER_ENABLE_PIN 40   // Pin should have a pullup/pulldown!
237
+    #define SPINDLE_LASER_ENA_PIN    40   // Pin should have a pullup/pulldown!
238
     #define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
238
     #define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
239
     #define SPINDLE_DIR_PIN          65
239
     #define SPINDLE_DIR_PIN          65
240
   #endif
240
   #endif

+ 1
- 1
Marlin/src/pins/pins_RAMPS_OLD.h Просмотреть файл

110
 //
110
 //
111
 // M3/M4/M5 - Spindle/Laser Control
111
 // M3/M4/M5 - Spindle/Laser Control
112
 //
112
 //
113
-#define SPINDLE_LASER_ENABLE_PIN 41   // Pin should have a pullup/pulldown!
113
+#define SPINDLE_LASER_ENA_PIN    41   // Pin should have a pullup/pulldown!
114
 #define SPINDLE_LASER_PWM_PIN    45   // MUST BE HARDWARE PWM
114
 #define SPINDLE_LASER_PWM_PIN    45   // MUST BE HARDWARE PWM
115
 #define SPINDLE_DIR_PIN          43
115
 #define SPINDLE_DIR_PIN          43

+ 3
- 3
Marlin/src/pins/pins_RAMPS_RE_ARM.h Просмотреть файл

200
   #define MAX6675_SS_PIN   P1_28
200
   #define MAX6675_SS_PIN   P1_28
201
 #endif
201
 #endif
202
 
202
 
203
-#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN)
203
+#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
204
   #if !defined(NUM_SERVOS) || NUM_SERVOS < 4   // Try to use servo connector
204
   #if !defined(NUM_SERVOS) || NUM_SERVOS < 4   // Try to use servo connector
205
     #define CASE_LIGHT_PIN P1_18   // (4) MUST BE HARDWARE PWM
205
     #define CASE_LIGHT_PIN P1_18   // (4) MUST BE HARDWARE PWM
206
   #endif
206
   #endif
210
 // M3/M4/M5 - Spindle/Laser Control
210
 // M3/M4/M5 - Spindle/Laser Control
211
 //            Use servo pins, if available
211
 //            Use servo pins, if available
212
 //
212
 //
213
-#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
213
+#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
214
   #if NUM_SERVOS > 1
214
   #if NUM_SERVOS > 1
215
     #error "SPINDLE_LASER_ENABLE requires 3 free servo pins."
215
     #error "SPINDLE_LASER_ENABLE requires 3 free servo pins."
216
   #endif
216
   #endif
217
-  #define SPINDLE_LASER_ENABLE_PIN SERVO1_PIN   // (6) Pin should have a pullup/pulldown!
217
+  #define SPINDLE_LASER_ENA_PIN    SERVO1_PIN   // (6) Pin should have a pullup/pulldown!
218
   #define SPINDLE_LASER_PWM_PIN    SERVO3_PIN   // (4) MUST BE HARDWARE PWM
218
   #define SPINDLE_LASER_PWM_PIN    SERVO3_PIN   // (4) MUST BE HARDWARE PWM
219
   #define SPINDLE_DIR_PIN          SERVO2_PIN   // (5)
219
   #define SPINDLE_DIR_PIN          SERVO2_PIN   // (5)
220
 #endif
220
 #endif

+ 2
- 2
Marlin/src/pins/pins_RUMBA.h Просмотреть файл

157
 #ifndef SPINDLE_LASER_PWM_PIN
157
 #ifndef SPINDLE_LASER_PWM_PIN
158
   #define SPINDLE_LASER_PWM_PIN 4   // MUST BE HARDWARE PWM. Pin 4 interrupts OC0* and OC1* always in use?
158
   #define SPINDLE_LASER_PWM_PIN 4   // MUST BE HARDWARE PWM. Pin 4 interrupts OC0* and OC1* always in use?
159
 #endif
159
 #endif
160
-#ifndef SPINDLE_LASER_ENABLE_PIN
161
-  #define SPINDLE_LASER_ENABLE_PIN 14   // Pin should have a pullup!
160
+#ifndef SPINDLE_LASER_ENA_PIN
161
+  #define SPINDLE_LASER_ENA_PIN    14   // Pin should have a pullup!
162
 #endif
162
 #endif
163
 #ifndef SPINDLE_DIR_PIN
163
 #ifndef SPINDLE_DIR_PIN
164
   #define SPINDLE_DIR_PIN  15
164
   #define SPINDLE_DIR_PIN  15

+ 3
- 3
Marlin/src/pins/pins_SANGUINOLOLU_11.h Просмотреть файл

279
 #if ENABLED(SPINDLE_LASER_ENABLE)
279
 #if ENABLED(SPINDLE_LASER_ENABLE)
280
   #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)  // try to use IO Header
280
   #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)  // try to use IO Header
281
 
281
 
282
-    #define SPINDLE_LASER_ENABLE_PIN 10   // Pin should have a pullup/pulldown!
282
+    #define SPINDLE_LASER_ENA_PIN    10   // Pin should have a pullup/pulldown!
283
     #define SPINDLE_LASER_PWM_PIN     4   // MUST BE HARDWARE PWM
283
     #define SPINDLE_LASER_PWM_PIN     4   // MUST BE HARDWARE PWM
284
     #define SPINDLE_DIR_PIN          11
284
     #define SPINDLE_DIR_PIN          11
285
 
285
 
307
      *                                /RESET  O|     |O  1A
307
      *                                /RESET  O|     |O  1A
308
      *                                /SLEEP  O|     |O  1B
308
      *                                /SLEEP  O|     |O  1B
309
      *  SPINDLE_LASER_PWM_PIN           STEP  O|     |O  VDD
309
      *  SPINDLE_LASER_PWM_PIN           STEP  O|     |O  VDD
310
-     *  SPINDLE_LASER_ENABLE_PIN         DIR  O|     |O  GND
310
+     *  SPINDLE_LASER_ENA_PIN         DIR  O|     |O  GND
311
      *                                         -------
311
      *                                         -------
312
      *
312
      *
313
      *  Note: Socket names vary from vendor to vendor.
313
      *  Note: Socket names vary from vendor to vendor.
319
     #define X_ENABLE_PIN             14
319
     #define X_ENABLE_PIN             14
320
     #define X_STEP_PIN                1
320
     #define X_STEP_PIN                1
321
     #define SPINDLE_LASER_PWM_PIN    15   // MUST BE HARDWARE PWM
321
     #define SPINDLE_LASER_PWM_PIN    15   // MUST BE HARDWARE PWM
322
-    #define SPINDLE_LASER_ENABLE_PIN 21   // Pin should have a pullup!
322
+    #define SPINDLE_LASER_ENA_PIN    21   // Pin should have a pullup!
323
     #define SPINDLE_DIR_PIN          -1   // No pin available on the socket for the direction pin
323
     #define SPINDLE_DIR_PIN          -1   // No pin available on the socket for the direction pin
324
   #endif
324
   #endif
325
 #endif // SPINDLE_LASER_ENABLE
325
 #endif // SPINDLE_LASER_ENABLE

+ 1
- 1
Marlin/src/pins/pins_SAV_MKI.h Просмотреть файл

176
   // M3/M4/M5 - Spindle/Laser Control
176
   // M3/M4/M5 - Spindle/Laser Control
177
   //
177
   //
178
   #define SPINDLE_LASER_PWM_PIN    24   // B4  PWM2A
178
   #define SPINDLE_LASER_PWM_PIN    24   // B4  PWM2A
179
-  #define SPINDLE_LASER_ENABLE_PIN 39   // F1  Pin should have a pullup!
179
+  #define SPINDLE_LASER_ENA_PIN    39   // F1  Pin should have a pullup!
180
   #define SPINDLE_DIR_PIN          40   // F2
180
   #define SPINDLE_DIR_PIN          40   // F2
181
 
181
 
182
   #define CASE_LIGHT_PIN            0   // D0  PWM0B
182
   #define CASE_LIGHT_PIN            0   // D0  PWM0B

+ 1
- 1
Marlin/src/pins/pins_STM3R_MINI.h Просмотреть файл

108
 // Laser control
108
 // Laser control
109
 #if ENABLED(SPINDLE_LASER_ENABLE)
109
 #if ENABLED(SPINDLE_LASER_ENABLE)
110
   #define SPINDLE_LASER_PWM_PIN     PB8
110
   #define SPINDLE_LASER_PWM_PIN     PB8
111
-  #define SPINDLE_LASER_ENABLE_PIN  PD5
111
+  #define SPINDLE_LASER_ENA_PIN     PD5
112
 #endif
112
 #endif
113
 
113
 
114
 //
114
 //

+ 1
- 1
Marlin/src/pins/pins_TEENSY2.h Просмотреть файл

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

+ 1
- 1
Marlin/src/pins/pins_TEENSYLU.h Просмотреть файл

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

+ 1
- 1
Marlin/src/pins/pins_ULTIMAIN_2.h Просмотреть файл

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

+ 1
- 1
Marlin/src/pins/pins_ULTIMAKER.h Просмотреть файл

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

+ 5
- 5
Marlin/src/pins/pins_ULTIMAKER_OLD.h Просмотреть файл

221
 
221
 
222
     #define SPINDLE_DIR_PIN          10   // SW4
222
     #define SPINDLE_DIR_PIN          10   // SW4
223
     #define SPINDLE_LASER_PWM_PIN     9   // SW5  MUST BE HARDWARE PWM
223
     #define SPINDLE_LASER_PWM_PIN     9   // SW5  MUST BE HARDWARE PWM
224
-    #define SPINDLE_LASER_ENABLE_PIN  8   // SW6  Pin should have a pullup!
224
+    #define SPINDLE_LASER_ENA_PIN     8   // SW6  Pin should have a pullup!
225
 
225
 
226
   #elif ENABLED(board_rev_1_5)      // use the same pins - but now they are on a different connector
226
   #elif ENABLED(board_rev_1_5)      // use the same pins - but now they are on a different connector
227
 
227
 
228
     #define SPINDLE_DIR_PIN          10   // EXP3-6 (silkscreen says 10)
228
     #define SPINDLE_DIR_PIN          10   // EXP3-6 (silkscreen says 10)
229
     #define SPINDLE_LASER_PWM_PIN     9   // EXP3-7 (silkscreen says 9) MUST BE HARDWARE PWM
229
     #define SPINDLE_LASER_PWM_PIN     9   // EXP3-7 (silkscreen says 9) MUST BE HARDWARE PWM
230
-    #define SPINDLE_LASER_ENABLE_PIN  8   // EXP3-8 (silkscreen says 8) Pin should have a pullup!
230
+    #define SPINDLE_LASER_ENA_PIN     8   // EXP3-8 (silkscreen says 8) Pin should have a pullup!
231
 
231
 
232
   #elif ENABLED(board_rev_1_1_TO_1_3)
232
   #elif ENABLED(board_rev_1_1_TO_1_3)
233
 
233
 
251
       #define E0_ENABLE_PIN            48
251
       #define E0_ENABLE_PIN            48
252
       #define SPINDLE_DIR_PIN          43
252
       #define SPINDLE_DIR_PIN          43
253
       #define SPINDLE_LASER_PWM_PIN    45   // MUST BE HARDWARE PWM
253
       #define SPINDLE_LASER_PWM_PIN    45   // MUST BE HARDWARE PWM
254
-      #define SPINDLE_LASER_ENABLE_PIN 41   // Pin should have a pullup!
254
+      #define SPINDLE_LASER_ENA_PIN    41   // Pin should have a pullup!
255
     #elif TEMP_SENSOR_BED == 0  // Can't use E0 so see if HEATER_BED_PIN is available
255
     #elif TEMP_SENSOR_BED == 0  // Can't use E0 so see if HEATER_BED_PIN is available
256
       #undef HEATER_BED_PIN
256
       #undef HEATER_BED_PIN
257
       #define SPINDLE_DIR_PIN          38   // Probably pin 4 on 10 pin connector closest to the E0 socket
257
       #define SPINDLE_DIR_PIN          38   // Probably pin 4 on 10 pin connector closest to the E0 socket
258
       #define SPINDLE_LASER_PWM_PIN     4   // MUST BE HARDWARE PWM - Special precautions usually needed.
258
       #define SPINDLE_LASER_PWM_PIN     4   // MUST BE HARDWARE PWM - Special precautions usually needed.
259
-      #define SPINDLE_LASER_ENABLE_PIN 40   // Pin should have a pullup! (Probably pin 6 on the 10-pin
259
+      #define SPINDLE_LASER_ENA_PIN    40   // Pin should have a pullup! (Probably pin 6 on the 10-pin
260
                                             // connector closest to the E0 socket)
260
                                             // connector closest to the E0 socket)
261
     #endif
261
     #endif
262
   #endif
262
   #endif
267
  *
267
  *
268
  *         spindle signal     socket name       socket name
268
  *         spindle signal     socket name       socket name
269
  *                                       -------
269
  *                                       -------
270
- * SPINDLE_LASER_ENABLE_PIN    /ENABLE  *|     |O  VMOT
270
+ * SPINDLE_LASER_ENA_PIN    /ENABLE  *|     |O  VMOT
271
  *                                 MS1  O|     |O  GND
271
  *                                 MS1  O|     |O  GND
272
  *                                 MS2  O|     |O  2B
272
  *                                 MS2  O|     |O  2B
273
  *                                 MS3  O|     |O  2A
273
  *                                 MS3  O|     |O  2A

Загрузка…
Отмена
Сохранить