From 37d2d09406fa07fcd5339a1c3630649852738a55 Mon Sep 17 00:00:00 2001 From: Brandon Kamphake Date: Thu, 9 Sep 2021 13:10:51 -0500 Subject: [PATCH 1/8] Inverted E1 --- Marlin/Configuration.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 0d20234df..e23d895f3 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -10,14 +10,14 @@ //#define TazDualZ /************** Uncomment a Tool Head Option From Below *********************/ -#define LULZBOT_UNIVERSAL_TOOLHEAD +//#define LULZBOT_UNIVERSAL_TOOLHEAD //#define TOOLHEAD_SL_SE_HE //#define TOOLHEAD_HS_HSPLUS //#define TOOLHEAD_H175 //#define TOOLHEAD_M175 //#define TOOLHEAD_SK175 //#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_Finch_Aerostruder // TAZ Legacy Titan Aerostruder v1 0.50 mm //#define TOOLHEAD_Tilapia_SingleExtruder // TAZ Legacy Standard Single Extruder @@ -1735,10 +1735,11 @@ // For direct drive extruder v9 set to true, for geared extruder set to false. #if ANY(Workhorse,TAZ6, TAZPro, TAZProXT) #define INVERT_E0_DIR true + #define INVERT_E1_DIR true #else #define INVERT_E0_DIR false + #define INVERT_E1_DIR false #endif -#define INVERT_E1_DIR false #define INVERT_E2_DIR false #define INVERT_E3_DIR false #define INVERT_E4_DIR false From 609811e1a78713b4e4725b865c3d73fcb8600c88 Mon Sep 17 00:00:00 2001 From: Brandon Kamphake Date: Thu, 9 Sep 2021 14:23:05 -0500 Subject: [PATCH 2/8] m109 wait time reduced (5 from 10) for quiver dual --- Marlin/Configuration.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index e23d895f3..6d1161a56 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -744,7 +744,12 @@ //#define MAX31865_SENSOR_OHMS_1 100 //#define MAX31865_CALIBRATION_OHMS_1 430 -#define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109 +#if defined(TOOLHEAD_Quiver_DualExtruder) // Dual Extruder is having trouble reaching bounds for + #define TEMP_RESIDENCY_TIME 5 // (seconds) Time to wait for hotend to "settle" in M109 +#else + #define TEMP_RESIDENCY_TIME 10 +#endif +//#define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109 #define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer #define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target From e853d5af0afa2cd692abc4c54dbbbe236a3265af Mon Sep 17 00:00:00 2001 From: Brandon Kamphake Date: Thu, 9 Sep 2021 15:18:06 -0500 Subject: [PATCH 3/8] updated sensorless homing for dual extruder --- Marlin/Configuration_adv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 8cd83e8c3..a7033d1a0 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -3009,11 +3009,11 @@ #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING) // TMC2209: 0...255. TMC2130: -64...63 #if ANY(TAZPro, TAZProXT) - #if ANY(LULZBOT_UNIVERSAL_TOOLHEAD, TOOLHEAD_M175) + #if defined(LULZBOT_UNIVERSAL_TOOLHEAD) #define X_STALL_SENSITIVITY 3 #define Y_STALL_SENSITIVITY 5 #else - #define X_STALL_SENSITIVITY 6 + #define X_STALL_SENSITIVITY 5 #define Y_STALL_SENSITIVITY 5 #endif #elif ENABLED(MiniV2) From 081f43088fe23c8f4edcb0f2b51a4773eef0120c Mon Sep 17 00:00:00 2001 From: Brandon Kamphake Date: Thu, 9 Sep 2021 16:56:42 -0500 Subject: [PATCH 4/8] Adjusted servo num and delay for not dual --- Marlin/Configuration.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6d1161a56..87bedc759 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -10,14 +10,14 @@ //#define TazDualZ /************** Uncomment a Tool Head Option From Below *********************/ -//#define LULZBOT_UNIVERSAL_TOOLHEAD +#define LULZBOT_UNIVERSAL_TOOLHEAD //#define TOOLHEAD_SL_SE_HE //#define TOOLHEAD_HS_HSPLUS //#define TOOLHEAD_H175 //#define TOOLHEAD_M175 //#define TOOLHEAD_SK175 //#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_Finch_Aerostruder // TAZ Legacy Titan Aerostruder v1 0.50 mm //#define TOOLHEAD_Tilapia_SingleExtruder // TAZ Legacy Standard Single Extruder @@ -3485,15 +3485,25 @@ * Set this manually if there are extra servos needing manual control. * Set to 0 to turn off servo support. */ -#define NUM_SERVOS LULZBOT_NUM_SERVOS // Servo index starts with 0 for M280 command +//#define NUM_SERVOS LULZBOT_NUM_SERVOS // Servo index starts with 0 for M280 command // (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. // If the servo can't reach the requested position, increase it. -#define SERVO_DELAY LULZBOT_SERVO_DELAY +//#define SERVO_DELAY LULZBOT_SERVO_DELAY // Only power servos during movement, otherwise leave off to prevent jitter //#define DEACTIVATE_SERVOS_AFTER_MOVE // Edit servo angles with M281 and save to EEPROM with M500 //#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 \ No newline at end of file From acfb47eeaacf3e55b7855aa17c8b193c9b3efddb Mon Sep 17 00:00:00 2001 From: Brandon Kamphake Date: Mon, 13 Sep 2021 10:34:08 -0500 Subject: [PATCH 5/8] cleaned up how servos are defined --- Marlin/Configuration.h | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 87bedc759..d105e973d 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -10,14 +10,14 @@ //#define TazDualZ /************** Uncomment a Tool Head Option From Below *********************/ -#define LULZBOT_UNIVERSAL_TOOLHEAD +//#define LULZBOT_UNIVERSAL_TOOLHEAD //#define TOOLHEAD_SL_SE_HE //#define TOOLHEAD_HS_HSPLUS //#define TOOLHEAD_H175 //#define TOOLHEAD_M175 //#define TOOLHEAD_SK175 //#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_Finch_Aerostruder // TAZ Legacy Titan Aerostruder v1 0.50 mm //#define TOOLHEAD_Tilapia_SingleExtruder // TAZ Legacy Standard Single Extruder @@ -744,7 +744,7 @@ //#define MAX31865_SENSOR_OHMS_1 100 //#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 #else #define TEMP_RESIDENCY_TIME 10 @@ -3485,25 +3485,17 @@ * Set this manually if there are extra servos needing manual control. * 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. // 300ms is a good value but you can try less delay. // 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 //#define DEACTIVATE_SERVOS_AFTER_MOVE // Edit servo angles with M281 and save to EEPROM with M500 -//#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 \ No newline at end of file +//#define EDITABLE_SERVO_ANGLES \ No newline at end of file From 869612a96da446d85776658fd7f551301b9155b3 Mon Sep 17 00:00:00 2001 From: Brandon Kamphake Date: Mon, 13 Sep 2021 10:41:05 -0500 Subject: [PATCH 6/8] Removed commented out line --- Marlin/Configuration.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d105e973d..034fbbb0d 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -747,9 +747,8 @@ #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 #else - #define TEMP_RESIDENCY_TIME 10 + #define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109 #endif -//#define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109 #define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer #define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target From 7d4c700e7c22ffc10b55b143e60a6ff27ea85576 Mon Sep 17 00:00:00 2001 From: Robert Henderson Date: Mon, 13 Sep 2021 15:47:55 +0000 Subject: [PATCH 7/8] fix typo in comment --- Marlin/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 034fbbb0d..79c794093 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -744,7 +744,7 @@ //#define MAX31865_SENSOR_OHMS_1 100 //#define MAX31865_CALIBRATION_OHMS_1 430 -#if defined(TOOLHEAD_Quiver_DualExtruder) // Shorten time that Dual Dxtruder has to wait for M109 +#if defined(TOOLHEAD_Quiver_DualExtruder) // Shorten time that Dual Extruder has to wait for M109 #define TEMP_RESIDENCY_TIME 5 // (seconds) Time to wait for hotend to "settle" in M109 #else #define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109 @@ -3497,4 +3497,4 @@ //#define DEACTIVATE_SERVOS_AFTER_MOVE // Edit servo angles with M281 and save to EEPROM with M500 -//#define EDITABLE_SERVO_ANGLES \ No newline at end of file +//#define EDITABLE_SERVO_ANGLES From 5036438af83163428cd318d278a36af2849a8215 Mon Sep 17 00:00:00 2001 From: Dawson Coleman Date: Mon, 13 Sep 2021 16:14:32 +0000 Subject: [PATCH 8/8] commented out all toolheads --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 79c794093..292028c6e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -17,7 +17,7 @@ //#define TOOLHEAD_M175 //#define TOOLHEAD_SK175 //#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_Finch_Aerostruder // TAZ Legacy Titan Aerostruder v1 0.50 mm //#define TOOLHEAD_Tilapia_SingleExtruder // TAZ Legacy Standard Single Extruder