🎨 Cutter pins cleanup

Marlin/src/pins/linux/pins_RAMPS_LINUX.h

@@ -221,12 +221,12 @@
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
   #if !defined(NUM_SERVOS) || NUM_SERVOS == 0     // Prefer the servo connector
-    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                    5
   #elif HAS_FREE_AUX2_PINS                        // try to use AUX 2
-    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                   65
   #endif
 #endif

Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h

@@ -252,8 +252,8 @@
       #error "LASER_FEATURE requires 3 free servo pins."
     #endif
   #endif
-  #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_ENA_PIN       SERVO1_PIN  // (6) Pin should have a pullup/pulldown!
   #define SPINDLE_DIR_PIN             SERVO2_PIN  // (5)
 #endif
 

Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h

@@ -153,8 +153,8 @@
   #undef HEATER_0_PIN
   #undef HEATER_BED_PIN
   #undef FAN0_PIN
-  #define SPINDLE_LASER_ENA_PIN            P2_07  // FET 1
   #define SPINDLE_LASER_PWM_PIN            P2_05  // Bed FET
+  #define SPINDLE_LASER_ENA_PIN            P2_07  // FET 1
   #define SPINDLE_DIR_PIN                  P2_06  // FET 4
 #endif
 

Marlin/src/pins/mega/pins_HJC2560C_REV2.h

@@ -114,9 +114,9 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
-  #define SPINDLE_DIR_PIN                     16
-  #define SPINDLE_LASER_ENA_PIN               17  // Pin should have a pullup!
   #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               17  // Pin should have a pullup!
+  #define SPINDLE_DIR_PIN                     16
 #endif
 
 //

Marlin/src/pins/mega/pins_MEGACONTROLLER.h

@@ -162,6 +162,8 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN                  6  // Hardware PWM
+#if HAS_CUTTER
-#define SPINDLE_LASER_ENA_PIN                  7  // Pullup!
+  #define SPINDLE_LASER_PWM_PIN                6  // Hardware PWM
-#define SPINDLE_DIR_PIN                        8
+  #define SPINDLE_LASER_ENA_PIN                7  // Pullup!
+  #define SPINDLE_DIR_PIN                      8
+#endif

Marlin/src/pins/mega/pins_MEGATRONICS.h

@@ -130,6 +130,8 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN                  3  // Hardware PWM
+#if HAS_CUTTER
-#define SPINDLE_LASER_ENA_PIN                  4  // Pullup!
+  #define SPINDLE_LASER_PWM_PIN                3  // Hardware PWM
-#define SPINDLE_DIR_PIN                       11
+  #define SPINDLE_LASER_ENA_PIN                4  // Pullup!
+  #define SPINDLE_DIR_PIN                     11
+#endif

Marlin/src/pins/mega/pins_MEGATRONICS_2.h

@@ -122,9 +122,11 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN                  3  // Hardware PWM
+#if HAS_CUTTER
-#define SPINDLE_LASER_ENA_PIN                 16  // Pullup!
+  #define SPINDLE_LASER_PWM_PIN                3  // Hardware PWM
-#define SPINDLE_DIR_PIN                       11
+  #define SPINDLE_LASER_ENA_PIN               16  // Pullup!
+  #define SPINDLE_DIR_PIN                     11
+#endif
 
 //
 // LCD / Controller

Marlin/src/pins/mega/pins_MINITRONICS.h

@@ -141,7 +141,7 @@
   #define HEATER_BED_PIN                       4  // won't compile
   #define TEMP_BED_PIN                        50
   #define TEMP_0_PIN                          51
-  #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_ENA_PIN               52  // using A6 because it already has a pullup
   #define SPINDLE_DIR_PIN                     53
 #endif

Marlin/src/pins/rambo/pins_EINSY_RAMBO.h

@@ -189,10 +189,12 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-// use P1 connector for spindle pins
+#if HAS_CUTTER
-#define SPINDLE_LASER_PWM_PIN        EXP1_02_PIN  // Hardware PWM
+  // Use P1 connector for spindle pins
-#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
+  #define SPINDLE_LASER_PWM_PIN      EXP1_02_PIN  // Hardware PWM
-#define SPINDLE_DIR_PIN                       19
+  #define SPINDLE_LASER_ENA_PIN               18  // Pullup!
+  #define SPINDLE_DIR_PIN                     19
+#endif
 
 //
 // Průša i3 MK2 Multiplexer Support

Marlin/src/pins/rambo/pins_EINSY_RETRO.h

@@ -153,10 +153,12 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-// use P1 connector for spindle pins
+#if HAS_CUTTER
-#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+  // Use P1 connector for spindle pins
-#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
+  #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
-#define SPINDLE_DIR_PIN                       19
+  #define SPINDLE_LASER_ENA_PIN               18  // Pullup!
+  #define SPINDLE_DIR_PIN                     19
+#endif
 
 //
 // Průša i3 MK2 Multiplexer Support

Marlin/src/pins/rambo/pins_MINIRAMBO.h

@@ -126,10 +126,12 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-// use P1 connector for spindle pins
+#if HAS_CUTTER
-#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+  // Use P1 connector for spindle pins
-#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
+  #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
-#define SPINDLE_DIR_PIN                       19
+  #define SPINDLE_LASER_ENA_PIN               18  // Pullup!
+  #define SPINDLE_DIR_PIN                     19
+#endif
 
 //
 // Průša i3 MK2 Multiplexer Support

Marlin/src/pins/rambo/pins_RAMBO.h

@@ -168,9 +168,11 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN                 45  // Hardware PWM
+#if HAS_CUTTER
-#define SPINDLE_LASER_ENA_PIN                 31  // Pullup!
+  #define SPINDLE_LASER_PWM_PIN               45  // Hardware PWM
-#define SPINDLE_DIR_PIN                       32
+  #define SPINDLE_LASER_ENA_PIN               31  // Pullup!
+  #define SPINDLE_DIR_PIN                     32
+#endif
 
 //
 // SPI for MAX Thermocouple

Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h

@@ -37,9 +37,11 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN                 66  // Pullup or pulldown!
+#if HAS_CUTTER
-#define SPINDLE_DIR_PIN                       67
+  #define SPINDLE_LASER_PWM_PIN               44  // Hardware PWM
-#define SPINDLE_LASER_PWM_PIN                 44  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               66  // Pullup or pulldown!
+  #define SPINDLE_DIR_PIN                     67
+#endif
 
 //
 // Temperature Sensors

Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h

@@ -95,9 +95,11 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN                 40  // Pullup or pulldown!
+#if HAS_CUTTER
-#define SPINDLE_LASER_PWM_PIN                 44  // Hardware PWM
+  #define SPINDLE_LASER_PWM_PIN               44  // Hardware PWM
-#define SPINDLE_DIR_PIN                       42
+  #define SPINDLE_LASER_ENA_PIN               40  // Pullup or pulldown!
+  #define SPINDLE_DIR_PIN                     42
+#endif
 
 //
 // Misc. Functions

Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h

@@ -44,12 +44,12 @@
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
   #if !NUM_SERVOS                                 // Try to use servo connector first
-    #define SPINDLE_LASER_ENA_PIN              6  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN              4  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN              6  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                    5
   #elif !GREEDY_PANEL                             // Try to use AUX2
-    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                   65
   #endif
 #endif

Marlin/src/pins/ramps/pins_RAMPS.h

@@ -309,8 +309,8 @@
     #endif
     #define SPINDLE_DIR_PIN                    5
   #elif HAS_FREE_AUX2_PINS
-    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                   65
   #else
     #error "No auto-assignable Spindle/Laser pins available."

Marlin/src/pins/ramps/pins_RAMPS_OLD.h

@@ -113,6 +113,8 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN                 41  // Pullup or pulldown!
+#if HAS_CUTTER
-#define SPINDLE_LASER_PWM_PIN                 45  // Hardware PWM
+  #define SPINDLE_LASER_PWM_PIN               45  // Hardware PWM
-#define SPINDLE_DIR_PIN                       43
+  #define SPINDLE_LASER_ENA_PIN               41  // Pullup or pulldown!
+  #define SPINDLE_DIR_PIN                     43
+#endif

Marlin/src/pins/ramps/pins_RAMPS_S_12.h

@@ -211,8 +211,8 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
-  #define SPINDLE_LASER_ENA_PIN                4  // Pullup or pulldown!
   #define SPINDLE_LASER_PWM_PIN                6  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN                4  // Pullup or pulldown!
   #define SPINDLE_DIR_PIN                      5
 #endif
 

Marlin/src/pins/ramps/pins_TT_OSCAR.h

@@ -228,12 +228,12 @@
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
   #if !NUM_SERVOS                                 // Prefer the servo connector
-    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                    5
   #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
-    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                   65
   #endif
 #endif

Marlin/src/pins/ramps/pins_ULTIMAIN_2.h

@@ -151,9 +151,9 @@
 //
 #if HAS_CUTTER                                    // use the LED_PIN for spindle speed control or case light
   #undef LED_PIN
-  #define SPINDLE_DIR_PIN                     16
-  #define SPINDLE_LASER_ENA_PIN               17  // Pullup!
   #define SPINDLE_LASER_PWM_PIN                8  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               17  // Pullup!
+  #define SPINDLE_DIR_PIN                     16
 #else
   #undef LED_PIN
   #define CASE_LIGHT_PIN                       8

Marlin/src/pins/ramps/pins_ULTIMAKER.h

@@ -162,6 +162,8 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+#if HAS_CUTTER
-#define SPINDLE_LASER_ENA_PIN                 10  // Pullup!
+  #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
-#define SPINDLE_DIR_PIN                       11  // use the EXP3 PWM header
+  #define SPINDLE_LASER_ENA_PIN               10  // Pullup!
+  #define SPINDLE_DIR_PIN                     11  // use the EXP3 PWM header
+#endif

Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h

@@ -226,9 +226,9 @@
 //
 #if HAS_CUTTER
   #if EITHER(BOARD_REV_1_0, BOARD_REV_1_5)        // Use the last three SW positions
-    #define SPINDLE_DIR_PIN                   10  // 1.0: SW4  1.5: EXP3-6 ("10")
     #define SPINDLE_LASER_PWM_PIN              9  // 1.0: SW5  1.5: EXP3-7 ( "9") .. MUST BE HARDWARE PWM
     #define SPINDLE_LASER_ENA_PIN              8  // 1.0: SW6  1.5: EXP3-8 ( "8") .. Pin should have a pullup!
+    #define SPINDLE_DIR_PIN                   10  // 1.0: SW4  1.5: EXP3-6 ("10")
   #elif ENABLED(BOARD_REV_1_1_TO_1_3)
     /**
      * Only four hardware PWMs physically connected to anything on these boards:
@@ -242,14 +242,14 @@
      * They have an LED and resistor pullup to +24V which could damage 3.3V-5V ICs.
      */
     #if EXTRUDERS == 1
-      #define SPINDLE_DIR_PIN                 43
       #define SPINDLE_LASER_PWM_PIN           45  // Hardware PWM
       #define SPINDLE_LASER_ENA_PIN           41  // Pullup!
+      #define SPINDLE_DIR_PIN                 43
     #elif TEMP_SENSOR_BED == 0                    // Can't use E0 so see if HEATER_BED_PIN is available
       #undef HEATER_BED_PIN
-      #define SPINDLE_DIR_PIN                 38  // Probably pin 4 on 10 pin connector closest to the E0 socket
       #define SPINDLE_LASER_PWM_PIN            4  // Hardware PWM - Special precautions usually needed.
       #define SPINDLE_LASER_ENA_PIN           40  // Pullup! (Probably pin 6 on the 10-pin
+      #define SPINDLE_DIR_PIN                 38  // Probably pin 4 on 10 pin connector closest to the E0 socket
                                             // connector closest to the E0 socket)
     #endif
   #endif

Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h

@@ -170,12 +170,12 @@
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
   #if !defined(NUM_SERVOS) || NUM_SERVOS == 0     // Prefer the servo connector
-    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                    5
   #elif HAS_FREE_AUX2_PINS
-    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                   65
   #endif
 #endif

Marlin/src/pins/sam/pins_RAMPS_FD_V1.h

@@ -260,7 +260,7 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HOTENDS < 3 && HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #define SPINDLE_LASER_ENA_PIN               45  // Use E2 ENA
   #define SPINDLE_LASER_PWM_PIN               12  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               45  // Use E2 ENA
   #define SPINDLE_DIR_PIN                     47  // Use E2 DIR
 #endif

Marlin/src/pins/samd/pins_RAMPS_144.h

@@ -155,8 +155,8 @@
 //
 #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
   #if !NUM_SERVOS                                 // Use servo connector if possible
-    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                    5
   #else
     #error "No auto-assignable Spindle/Laser pins available."

Marlin/src/pins/sanguino/pins_GEN6.h

@@ -117,6 +117,8 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN                  5  // Pullup or pulldown!
+#if HAS_CUTTER
-#define SPINDLE_LASER_PWM_PIN                 16  // Hardware PWM
+  #define SPINDLE_LASER_PWM_PIN               16  // Hardware PWM
-#define SPINDLE_DIR_PIN                        6
+  #define SPINDLE_LASER_ENA_PIN                5  // Pullup or pulldown!
+  #define SPINDLE_DIR_PIN                      6
+#endif

Marlin/src/pins/sanguino/pins_GEN7_14.h

@@ -118,6 +118,8 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN                 20  // Pullup or pulldown!
+#if HAS_CUTTER
-#define SPINDLE_LASER_PWM_PIN                 16  // Hardware PWM
+  #define SPINDLE_LASER_PWM_PIN               16  // Hardware PWM
-#define SPINDLE_DIR_PIN                       21
+  #define SPINDLE_LASER_ENA_PIN               20  // Pullup or pulldown!
+  #define SPINDLE_DIR_PIN                     21
+#endif

Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h

@@ -134,6 +134,8 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN                  5  // Pullup or pulldown!
+#if HAS_CUTTER
-#define SPINDLE_LASER_PWM_PIN                 16  // Hardware PWM
+  #define SPINDLE_LASER_PWM_PIN               16  // Hardware PWM
-#define SPINDLE_DIR_PIN                        6
+  #define SPINDLE_LASER_ENA_PIN                5  // Pullup or pulldown!
+  #define SPINDLE_DIR_PIN                      6
+#endif

Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h

@@ -272,8 +272,8 @@
 #if HAS_CUTTER
   #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header
 
-    #define SPINDLE_LASER_ENA_PIN             10  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN              4  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             10  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                   11
 
   #elif !MB(MELZI)                                // use X stepper motor socket

Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h

@@ -86,8 +86,8 @@
   //#define HEATER_0_PIN                    -1
   //#define HEATER_BED_PIN                  -1
   #define FAN0_PIN                          -1
-  #define SPINDLE_LASER_ENA_PIN             PC0   // FET 1
   #define SPINDLE_LASER_PWM_PIN             PC0   // Bed FET
+  #define SPINDLE_LASER_ENA_PIN             PC0   // FET 1
   #define SPINDLE_DIR_PIN                   PC0   // FET 4
   #define LASER_SOFT_PWM_PIN                PC0
 #endif

Marlin/src/pins/teensy2/pins_TEENSY2.h

@@ -182,6 +182,8 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN                  5  // D5  Pin should have a pullup!
+#if HAS_CUTTER
-#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_LASER_ENA_PIN                5  // D5  Pin should have a pullup!
+  #define SPINDLE_DIR_PIN                      7  // D7
+#endif

Marlin/src/pins/teensy2/pins_TEENSYLU.h

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