CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaned up how servos are defined

Browse Source
This commit is contained in:
Brandon Kamphake 2021-09-13 10:34:08 -05:00
parent 081f43088f
commit acfb47eeaa
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Marlin/Configuration.h
View File

@ -10,14 +10,14 @@
//#define TazDualZ //#define TazDualZ
/************** Uncomment a Tool Head Option From Below *********************/ /************** Uncomment a Tool Head Option From Below *********************/
#define LULZBOT_UNIVERSAL_TOOLHEAD //#define LULZBOT_UNIVERSAL_TOOLHEAD
//#define TOOLHEAD_SL_SE_HE //#define TOOLHEAD_SL_SE_HE
//#define TOOLHEAD_HS_HSPLUS //#define TOOLHEAD_HS_HSPLUS
//#define TOOLHEAD_H175 //#define TOOLHEAD_H175
//#define TOOLHEAD_M175 //#define TOOLHEAD_M175
//#define TOOLHEAD_SK175 //#define TOOLHEAD_SK175
//#define TOOLHEAD_SK285 //#define TOOLHEAD_SK285
//#define TOOLHEAD_Quiver_DualExtruder // TAZ Pro Dual Extruder #define TOOLHEAD_Quiver_DualExtruder // TAZ Pro Dual Extruder
//#define TOOLHEAD_Albatross_Flexystruder // TAZ Legacy Flexystruder //#define TOOLHEAD_Albatross_Flexystruder // TAZ Legacy Flexystruder
//#define TOOLHEAD_Finch_Aerostruder // TAZ Legacy Titan Aerostruder v1 0.50 mm //#define TOOLHEAD_Finch_Aerostruder // TAZ Legacy Titan Aerostruder v1 0.50 mm
//#define TOOLHEAD_Tilapia_SingleExtruder // TAZ Legacy Standard Single Extruder //#define TOOLHEAD_Tilapia_SingleExtruder // TAZ Legacy Standard Single Extruder
@ -744,7 +744,7 @@
//#define MAX31865_SENSOR_OHMS_1 100 //#define MAX31865_SENSOR_OHMS_1 100
//#define MAX31865_CALIBRATION_OHMS_1 430 //#define MAX31865_CALIBRATION_OHMS_1 430
#if defined(TOOLHEAD_Quiver_DualExtruder) // Dual Extruder is having trouble reaching bounds for #if defined(TOOLHEAD_Quiver_DualExtruder) // Shorten time that Dual Dxtruder has to wait for M109
#define TEMP_RESIDENCY_TIME 5 // (seconds) Time to wait for hotend to "settle" in M109 #define TEMP_RESIDENCY_TIME 5 // (seconds) Time to wait for hotend to "settle" in M109
#else #else
#define TEMP_RESIDENCY_TIME 10 #define TEMP_RESIDENCY_TIME 10
@ -3485,25 +3485,17 @@
* Set this manually if there are extra servos needing manual control. * Set this manually if there are extra servos needing manual control.
* Set to 0 to turn off servo support. * Set to 0 to turn off servo support.
*/ */
//#define NUM_SERVOS LULZBOT_NUM_SERVOS // Servo index starts with 0 for M280 command #if defined(LULZBOT_NUM_SERVOS)
#define NUM_SERVOS LULZBOT_NUM_SERVOS // Servo index starts with 0 for M280 command
#endif
// (ms) Delay before the next move will start, to give the servo time to reach its target angle. // (ms) Delay before the next move will start, to give the servo time to reach its target angle.
// 300ms is a good value but you can try less delay. // 300ms is a good value but you can try less delay.
// If the servo can't reach the requested position, increase it. // If the servo can't reach the requested position, increase it.
//#define SERVO_DELAY LULZBOT_SERVO_DELAY #if defined(LULZBOT_SERVO_DELAY)
#define SERVO_DELAY LULZBOT_SERVO_DELAY
#endif
// Only power servos during movement, otherwise leave off to prevent jitter // Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE //#define DEACTIVATE_SERVOS_AFTER_MOVE
// Edit servo angles with M281 and save to EEPROM with M500 // Edit servo angles with M281 and save to EEPROM with M500
//#define EDITABLE_SERVO_ANGLES //#define EDITABLE_SERVO_ANGLES
#if defined(TOOLHEAD_Quiver_DualExtruder)
#define SERVO_DELAY LULZBOT_SERVO_DELAY
#define NUM_SERVOS LULZBOT_NUM_SERVOS
#elif ANY(LULZBOT_Sidekick_289, LULZBOT_Sidekick_747)
#define NUM_SERVOS 1
#else
#define SERVO_DELAY 0
#define NUM_SERVOS 0
#endif