Browse Source

🔧 Normal FET layout with Spindle/Laser (#23409)

Mike La Spina 3 years ago
parent
commit
d007c1b835
No account linked to committer's email address

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

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

+ 1
- 1
Marlin/src/pins/pins.h View File

45
   #define FET_ORDER_EFF 1
45
   #define FET_ORDER_EFF 1
46
 #elif MB(RAMPS_13_EEF, RAMPS_14_EEF, RAMPS_PLUS_EEF, RAMPS_14_RE_ARM_EEF, RAMPS_SMART_EEF, RAMPS_DUO_EEF, RAMPS4DUE_EEF)
46
 #elif MB(RAMPS_13_EEF, RAMPS_14_EEF, RAMPS_PLUS_EEF, RAMPS_14_RE_ARM_EEF, RAMPS_SMART_EEF, RAMPS_DUO_EEF, RAMPS4DUE_EEF)
47
   #define FET_ORDER_EEF 1
47
   #define FET_ORDER_EEF 1
48
-#elif MB(RAMPS_13_SF,  RAMPS_14_SF,  RAMPS_PLUS_SF,  RAMPS_14_RE_ARM_SF,  RAMPS_SMART_SF,  RAMPS_DUO_SF,  RAMPS4DUE_SF) || EITHER(SPINDLE_FEATURE, LASER_FEATURE)
48
+#elif MB(RAMPS_13_SF,  RAMPS_14_SF,  RAMPS_PLUS_SF,  RAMPS_14_RE_ARM_SF,  RAMPS_SMART_SF,  RAMPS_DUO_SF,  RAMPS4DUE_SF)
49
   #define FET_ORDER_SF 1
49
   #define FET_ORDER_SF 1
50
 #elif HAS_MULTI_HOTEND && TEMP_SENSOR_BED
50
 #elif HAS_MULTI_HOTEND && TEMP_SENSOR_BED
51
   #define FET_ORDER_EEB 1
51
   #define FET_ORDER_EEB 1

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

226
 //
226
 //
227
 // M3/M4/M5 - Spindle/Laser Control
227
 // M3/M4/M5 - Spindle/Laser Control
228
 //
228
 //
229
-#if EITHER(SPINDLE_FEATURE, LASER_FEATURE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
229
+#if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
230
   #if !NUM_SERVOS                                 // Prefer the servo connector
230
   #if !NUM_SERVOS                                 // Prefer the servo connector
231
     #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
231
     #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
232
     #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
232
     #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM

+ 1
- 1
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h View File

135
   #define LCD_BACKLIGHT_PIN                   17  // LCD backlight LED
135
   #define LCD_BACKLIGHT_PIN                   17  // LCD backlight LED
136
 #endif
136
 #endif
137
 
137
 
138
-#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
138
+#if !HAS_CUTTER && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
139
   #define CASE_LIGHT_PIN                       4  // Hardware PWM  - see if IO Header is available
139
   #define CASE_LIGHT_PIN                       4  // Hardware PWM  - see if IO Header is available
140
 #endif
140
 #endif
141
 
141
 

+ 1
- 1
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h View File

253
   #define FAN_PIN                           PB7   // Fan0
253
   #define FAN_PIN                           PB7   // Fan0
254
 #endif
254
 #endif
255
 
255
 
256
-#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
256
+#if HAS_CUTTER
257
   #ifndef SPINDLE_LASER_PWM_PIN
257
   #ifndef SPINDLE_LASER_PWM_PIN
258
     #define SPINDLE_LASER_PWM_PIN           PB5
258
     #define SPINDLE_LASER_PWM_PIN           PB5
259
   #endif
259
   #endif

Loading…
Cancel
Save