bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🐛 Fix old spindle/laser options

Browse Source
This commit is contained in:
Scott Lahteine 2021-09-13 16:38:51 -05:00
parent de4eed33e4
commit 92eb819aee
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/pins/mega/pins_HJC2560C_REV2.h
View File

@ -112,9 +112,9 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#if ENABLED(SPINDLE_LASER_ENABLE) #if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
#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 9 // Hardware PWM #define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
#endif #endif

24
Marlin/src/pins/ramps/pins_TT_OSCAR.h
View File

@ -224,28 +224,28 @@
#endif #endif
// //
// Case Light // M3/M4/M5 - Spindle/Laser Control
// //
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN) #if EITHER(SPINDLE_FEATURE, LASER_FEATURE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
#if !NUM_SERVOS // Prefer the servo connector #if !NUM_SERVOS // Prefer the servo connector
#define CASE_LIGHT_PIN 6 // Hardware PWM #define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
#define SPINDLE_DIR_PIN 5
#elif HAS_FREE_AUX2_PINS // Try to use AUX 2 #elif HAS_FREE_AUX2_PINS // Try to use AUX 2
#define CASE_LIGHT_PIN 44 // Hardware PWM #define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#define SPINDLE_DIR_PIN 65
#endif #endif
#endif #endif
// //
// M3/M4/M5 - Spindle/Laser Control // Case Light
// //
#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
#if !NUM_SERVOS // Prefer the servo connector #if !NUM_SERVOS // Prefer the servo connector
#define SPINDLE_LASER_ENABLE_PIN 4 // Pullup or pulldown! #define CASE_LIGHT_PIN 6 // Hardware PWM
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
#define SPINDLE_DIR_PIN 5
#elif HAS_FREE_AUX2_PINS // Try to use AUX 2 #elif HAS_FREE_AUX2_PINS // Try to use AUX 2
#define SPINDLE_LASER_ENABLE_PIN 40 // Pullup or pulldown! #define CASE_LIGHT_PIN 44 // Hardware PWM
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#define SPINDLE_DIR_PIN 65
#endif #endif
#endif #endif