Browse Source

🐛 Fix old spindle/laser options

Scott Lahteine 3 years ago
parent
commit
3587ef2e8f
2 changed files with 14 additions and 14 deletions
  1. 2
    2
      Marlin/src/pins/mega/pins_HJC2560C_REV2.h
  2. 12
    12
      Marlin/src/pins/ramps/pins_TT_OSCAR.h

+ 2
- 2
Marlin/src/pins/mega/pins_HJC2560C_REV2.h View File

@@ -112,9 +112,9 @@
112 112
 //
113 113
 // M3/M4/M5 - Spindle/Laser Control
114 114
 //
115
-#if ENABLED(SPINDLE_LASER_ENABLE)
115
+#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
116 116
   #define SPINDLE_DIR_PIN                     16
117
-  #define SPINDLE_LASER_ENABLE_PIN            17  // Pin should have a pullup!
117
+  #define SPINDLE_LASER_ENA_PIN               17  // Pin should have a pullup!
118 118
   #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
119 119
 #endif
120 120
 

+ 12
- 12
Marlin/src/pins/ramps/pins_TT_OSCAR.h View File

@@ -224,28 +224,28 @@
224 224
 #endif
225 225
 
226 226
 //
227
-// Case Light
227
+// M3/M4/M5 - Spindle/Laser Control
228 228
 //
229
-#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN)
229
+#if EITHER(SPINDLE_FEATURE, LASER_FEATURE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
230 230
   #if !NUM_SERVOS                                 // Prefer the servo connector
231
-    #define CASE_LIGHT_PIN                     6  // Hardware PWM
231
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
232
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
233
+    #define SPINDLE_DIR_PIN                    5
232 234
   #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
233
-    #define CASE_LIGHT_PIN                    44  // Hardware PWM
235
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
236
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
237
+    #define SPINDLE_DIR_PIN                   65
234 238
   #endif
235 239
 #endif
236 240
 
237 241
 //
238
-// M3/M4/M5 - Spindle/Laser Control
242
+// Case Light
239 243
 //
240
-#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
244
+#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
241 245
   #if !NUM_SERVOS                                 // Prefer the servo connector
242
-    #define SPINDLE_LASER_ENABLE_PIN           4  // Pullup or pulldown!
243
-    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
244
-    #define SPINDLE_DIR_PIN                    5
246
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
245 247
   #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
246
-    #define SPINDLE_LASER_ENABLE_PIN          40  // Pullup or pulldown!
247
-    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
248
-    #define SPINDLE_DIR_PIN                   65
248
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
249 249
   #endif
250 250
 #endif
251 251
 

Loading…
Cancel
Save