From 3ec38727305862c881f268e2fc27f8188b5bc767 Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Wed, 17 Oct 2018 12:11:41 -0400 Subject: [PATCH] Single Z raise value for all tool-changing / parking (#12090) * Universal tool-change Z lift * Add TOOLCHANGE_ZRAISE to example configs * Park/unpark changes to example configs * Implement DEBUG_DXC_MODE --- Marlin/Configuration.h | 6 +- Marlin/Configuration_adv.h | 4 - Marlin/src/config/default/Configuration.h | 6 +- Marlin/src/config/default/Configuration_adv.h | 4 - .../AlephObjects/TAZ4/Configuration.h | 6 +- .../AlephObjects/TAZ4/Configuration_adv.h | 4 - .../AliExpress/CL-260/Configuration.h | 6 +- .../config/examples/Anet/A2/Configuration.h | 6 +- .../examples/Anet/A2/Configuration_adv.h | 4 - .../examples/Anet/A2plus/Configuration.h | 6 +- .../examples/Anet/A2plus/Configuration_adv.h | 4 - .../config/examples/Anet/A6/Configuration.h | 6 +- .../examples/Anet/A6/Configuration_adv.h | 4 - .../config/examples/Anet/A8/Configuration.h | 6 +- .../examples/Anet/A8/Configuration_adv.h | 4 - .../examples/Azteeg/X5GT/Configuration.h | 6 +- .../BIBO/TouchX/cyclops/Configuration.h | 6 +- .../BIBO/TouchX/cyclops/Configuration_adv.h | 4 - .../BIBO/TouchX/default/Configuration.h | 6 +- .../BIBO/TouchX/default/Configuration_adv.h | 4 - .../examples/BQ/Hephestos/Configuration.h | 6 +- .../examples/BQ/Hephestos/Configuration_adv.h | 4 - .../examples/BQ/Hephestos_2/Configuration.h | 6 +- .../BQ/Hephestos_2/Configuration_adv.h | 4 - .../config/examples/BQ/WITBOX/Configuration.h | 6 +- .../examples/BQ/WITBOX/Configuration_adv.h | 4 - .../config/examples/Cartesio/Configuration.h | 6 +- .../examples/Cartesio/Configuration_adv.h | 4 - .../examples/Creality/CR-10/Configuration.h | 6 +- .../Creality/CR-10/Configuration_adv.h | 4 - .../examples/Creality/CR-10S/Configuration.h | 6 +- .../Creality/CR-10S/Configuration_adv.h | 4 - .../Creality/CR-10mini/Configuration.h | 6 +- .../Creality/CR-10mini/Configuration_adv.h | 4 - .../examples/Creality/CR-8/Configuration.h | 6 +- .../Creality/CR-8/Configuration_adv.h | 4 - .../examples/Creality/Ender-2/Configuration.h | 6 +- .../Creality/Ender-2/Configuration_adv.h | 4 - .../examples/Creality/Ender-3/Configuration.h | 6 +- .../Creality/Ender-3/Configuration_adv.h | 4 - .../examples/Creality/Ender-4/Configuration.h | 6 +- .../Creality/Ender-4/Configuration_adv.h | 4 - .../examples/Einstart-S/Configuration.h | 6 +- .../examples/Einstart-S/Configuration_adv.h | 4 - .../src/config/examples/Felix/Configuration.h | 6 +- .../config/examples/Felix/Configuration_adv.h | 4 - .../examples/Felix/DUAL/Configuration.h | 6 +- .../FolgerTech/i3-2020/Configuration.h | 6 +- .../FolgerTech/i3-2020/Configuration_adv.h | 4 - .../examples/Formbot/Raptor/Configuration.h | 6 +- .../Formbot/Raptor/Configuration_adv.h | 4 - .../examples/Formbot/T_Rex_2+/Configuration.h | 6 +- .../Formbot/T_Rex_2+/Configuration_adv.h | 4 - .../examples/Formbot/T_Rex_3/Configuration.h | 6 +- .../Formbot/T_Rex_3/Configuration_adv.h | 4 - .../examples/Geeetech/GT2560/Configuration.h | 6 +- .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 6 +- .../Geeetech/MeCreator2/Configuration.h | 6 +- .../Geeetech/MeCreator2/Configuration_adv.h | 4 - .../Prusa i3 Pro B/bltouch/Configuration.h | 6 +- .../Prusa i3 Pro B/noprobe/Configuration.h | 6 +- .../Geeetech/Prusa i3 Pro C/Configuration.h | 6 +- .../Prusa i3 Pro C/Configuration_adv.h | 4 - .../Geeetech/Prusa i3 Pro W/Configuration.h | 6 +- .../Prusa i3 Pro W/Configuration_adv.h | 4 - .../examples/Infitary/i3-M508/Configuration.h | 6 +- .../Infitary/i3-M508/Configuration_adv.h | 4 - .../examples/JGAurora/A5/Configuration.h | 6 +- .../examples/JGAurora/A5/Configuration_adv.h | 4 - .../examples/MakerParts/Configuration.h | 6 +- .../examples/MakerParts/Configuration_adv.h | 4 - .../examples/Malyan/M150/Configuration.h | 6 +- .../examples/Malyan/M150/Configuration_adv.h | 4 - .../examples/Malyan/M200/Configuration.h | 6 +- .../examples/Malyan/M200/Configuration_adv.h | 4 - .../Micromake/C1/basic/Configuration.h | 6 +- .../Micromake/C1/enhanced/Configuration.h | 6 +- .../Micromake/C1/enhanced/Configuration_adv.h | 4 - .../config/examples/Mks/Sbase/Configuration.h | 6 +- .../examples/Mks/Sbase/Configuration_adv.h | 4 - .../examples/RepRapPro/Huxley/Configuration.h | 6 +- .../RepRapWorld/Megatronics/Configuration.h | 6 +- .../config/examples/RigidBot/Configuration.h | 6 +- .../examples/RigidBot/Configuration_adv.h | 4 - .../src/config/examples/SCARA/Configuration.h | 6 +- .../config/examples/SCARA/Configuration_adv.h | 4 - .../config/examples/STM32F10/Configuration.h | 6 +- .../config/examples/STM32F4/Configuration.h | 6 +- .../examples/Sanguinololu/Configuration.h | 6 +- .../examples/Sanguinololu/Configuration_adv.h | 4 - .../config/examples/TheBorg/Configuration.h | 6 +- .../examples/TheBorg/Configuration_adv.h | 4 - .../config/examples/TinyBoy2/Configuration.h | 6 +- .../examples/TinyBoy2/Configuration_adv.h | 4 - .../config/examples/Tronxy/X1/Configuration.h | 6 +- .../examples/Tronxy/X3A/Configuration.h | 6 +- .../examples/Tronxy/X3A/Configuration_adv.h | 4 - .../examples/Tronxy/X5S/Configuration.h | 6 +- .../examples/Tronxy/XY100/Configuration.h | 6 +- .../UltiMachine/Archim2/Configuration.h | 6 +- .../UltiMachine/Archim2/Configuration_adv.h | 4 - .../examples/Velleman/K8200/Configuration.h | 6 +- .../Velleman/K8200/Configuration_adv.h | 4 - .../examples/Velleman/K8400/Configuration.h | 6 +- .../Velleman/K8400/Configuration_adv.h | 4 - .../Velleman/K8400/Dual-head/Configuration.h | 6 +- .../Wanhao/Duplicator 6/Configuration.h | 6 +- .../Wanhao/Duplicator 6/Configuration_adv.h | 4 - .../examples/adafruit/ST7565/Configuration.h | 6 +- .../delta/Anycubic/Kossel/Configuration.h | 6 +- .../delta/Anycubic/Kossel/Configuration_adv.h | 4 - .../FLSUN/auto_calibrate/Configuration.h | 6 +- .../FLSUN/auto_calibrate/Configuration_adv.h | 4 - .../delta/FLSUN/kossel/Configuration.h | 6 +- .../delta/FLSUN/kossel/Configuration_adv.h | 4 - .../delta/FLSUN/kossel_mini/Configuration.h | 6 +- .../FLSUN/kossel_mini/Configuration_adv.h | 4 - .../delta/Hatchbox_Alpha/Configuration.h | 6 +- .../examples/delta/generic/Configuration.h | 6 +- .../delta/generic/Configuration_adv.h | 4 - .../delta/kossel_mini/Configuration.h | 6 +- .../delta/kossel_mini/Configuration_adv.h | 4 - .../examples/delta/kossel_pro/Configuration.h | 6 +- .../examples/delta/kossel_xl/Configuration.h | 6 +- .../delta/kossel_xl/Configuration_adv.h | 4 - .../examples/gCreate/gMax1.5+/Configuration.h | 6 +- .../gCreate/gMax1.5+/Configuration_adv.h | 4 - .../config/examples/makibox/Configuration.h | 6 +- .../examples/makibox/Configuration_adv.h | 4 - .../examples/stm32f103ret6/Configuration.h | 6 +- .../examples/tvrrug/Round2/Configuration.h | 6 +- .../tvrrug/Round2/Configuration_adv.h | 4 - .../src/config/examples/wt150/Configuration.h | 6 +- .../config/examples/wt150/Configuration_adv.h | 4 - Marlin/src/gcode/config/M217.cpp | 45 ++++++---- Marlin/src/gcode/control/M605.cpp | 86 ++++++++++--------- Marlin/src/gcode/gcode.cpp | 2 +- Marlin/src/gcode/gcode.h | 2 +- Marlin/src/inc/SanityCheck.h | 28 +++--- Marlin/src/lcd/language/language_en.h | 7 +- Marlin/src/lcd/ultralcd.cpp | 17 ++-- Marlin/src/module/configuration_store.cpp | 27 +++--- Marlin/src/module/tool_change.cpp | 45 +++++----- Marlin/src/module/tool_change.h | 26 ++++-- 144 files changed, 395 insertions(+), 580 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index bdfb99446c..1ab2080bfb 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 9f795a13a0..f1e814126c 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h index bdfb99446c..1ab2080bfb 100644 --- a/Marlin/src/config/default/Configuration.h +++ b/Marlin/src/config/default/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h index 9f795a13a0..f1e814126c 100755 --- a/Marlin/src/config/default/Configuration_adv.h +++ b/Marlin/src/config/default/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h index d8433f57f0..76b3e274de 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -962,6 +959,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 250 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h index 15a4e0b6c7..47f259c137 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h index 28b048ee7b..de54cd719d 100644 --- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h +++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 260 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Anet/A2/Configuration.h b/Marlin/src/config/examples/Anet/A2/Configuration.h index b938765c30..e8e7f4213b 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h index 41c12da14a..ca6ee47fe8 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration.h b/Marlin/src/config/examples/Anet/A2plus/Configuration.h index aebaff1d9d..490c6ee002 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h index 41c12da14a..ca6ee47fe8 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h index 8848523ec8..751ac0a4f4 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1057,6 +1054,9 @@ #define X_MAX_POS X_BED_SIZE #define Y_MAX_POS Y_BED_SIZE +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h index 75a17f0027..ae87f8dd59 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h index ad5b725ccc..8edffae41f 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration.h @@ -162,7 +162,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -216,7 +215,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -234,7 +232,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -949,6 +946,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 240 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h index 482bd44f7b..850c265094 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h index 628b35460b..cf5bbf3218 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h index 7510b7500d..b53124d944 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS 186 #define Z_MAX_POS 186 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h index 1ea10aece0..bfe6aa5403 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h index 00d1c34ea9..de5e0ca7fb 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS 93 #define Z_MAX_POS 186 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h index 7f82981042..e4b24d0eaf 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h index cbcea8178b..bde5f4e7ad 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -930,6 +927,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 180 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h index 13aade60b5..e489d2671a 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h index 972afadfe9..57c6bfe1bd 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h @@ -169,7 +169,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -223,7 +222,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -241,7 +239,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -943,6 +940,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 210 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h index 6d3793ef13..4f21e1adfa 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h index 0eec5cdb31..f63c4dc9dd 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -930,6 +927,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h index 13aade60b5..e489d2671a 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h index 96259335d9..a4ea69da34 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration.h +++ b/Marlin/src/config/examples/Cartesio/Configuration.h @@ -162,7 +162,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -216,7 +215,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -234,7 +232,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -941,6 +938,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 400 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h index 6f333b1c56..746dc90d82 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h +++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h index 69fa9dfc7c..f9b7fba675 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -952,6 +949,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 400 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h index e1c4b2ea7d..c6a21f8f7d 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h index d176b2c7fe..f6bea2cb82 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h @@ -165,7 +165,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -219,7 +218,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -237,7 +235,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -946,6 +943,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 400 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h index 6acc8cf3b2..b5b3cc3411 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h index 916ecad9a7..c92bcc687a 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h @@ -170,7 +170,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -224,7 +223,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -242,7 +240,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -961,6 +958,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 300 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h index f807c886e0..cec32a087b 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration.h b/Marlin/src/config/examples/Creality/CR-8/Configuration.h index 522637a814..fc5685b289 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -952,6 +949,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 310 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h index 4848b687f3..7480258c14 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h index 8d97099f4b..8c71757025 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -946,6 +943,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h index 4e26c30028..0ac8d6640d 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h index 6be61fad7c..3726231f01 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -946,6 +943,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 250 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h index 4631bee785..653869949b 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h index 1f02233c6a..79be3236d7 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -952,6 +949,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 310 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h index 9366866025..af4e46ecfd 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Einstart-S/Configuration.h b/Marlin/src/config/examples/Einstart-S/Configuration.h index c0c66e8c19..fb1e204903 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -952,6 +949,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 165 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h index 1be9a7b4ce..bf88256164 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h index 89505e1a92..a47edf3a4c 100644 --- a/Marlin/src/config/examples/Felix/Configuration.h +++ b/Marlin/src/config/examples/Felix/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -924,6 +921,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 235 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h index 3a20d5d325..8d24dd6d58 100644 --- a/Marlin/src/config/examples/Felix/Configuration_adv.h +++ b/Marlin/src/config/examples/Felix/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h index 8e1d2c4418..8711f20d36 100644 --- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h +++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -924,6 +921,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 235 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h index 71def1900b..5c2b304ca3 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -948,6 +945,9 @@ #define Y_MAX_POS 182 #define Z_MAX_POS 175 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h index a5110db4fa..7411ae83e5 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration.h index 9d8d665f7b..16de187c81 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration.h @@ -202,7 +202,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -256,7 +255,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -274,7 +272,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1038,6 +1035,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 500 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h index 20bc3993a0..24e950c4a4 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h index d987247f17..12f924d0d6 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h @@ -164,7 +164,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -218,7 +217,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -236,7 +234,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -984,6 +981,9 @@ #define Z_MAX_POS 500 #endif +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h index bddecc9f0c..91357ca006 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h @@ -389,10 +389,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_AUTO_PARK_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 200 diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h index ff4c3eb2da..744911f6ab 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h @@ -165,7 +165,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -219,7 +218,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -237,7 +235,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -967,6 +964,9 @@ #define Z_MAX_POS 500 #endif +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h index 285b993f3a..9f4531b04a 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h @@ -390,10 +390,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_AUTO_PARK_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 200 diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h index e7e3def6ac..c54a6e80bd 100644 --- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -957,6 +954,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h index f280f59fad..73519dbef2 100644 --- a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 170 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h index d88b12af44..97f9db39b7 100644 --- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -949,6 +946,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 162 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h index e4f48572b8..89a466e9cb 100644 --- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h index d389db651d..330e30166a 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -958,6 +955,9 @@ #define Y_MAX_POS (-Y_MIN_POS+Y_BED_SIZE) #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h index 9886496b01..5f6c6fdb95 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -957,6 +954,9 @@ #define Y_MAX_POS (-Y_MIN_POS+Y_BED_SIZE) #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h index e1b00990b1..98e980c742 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 180 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h index cc30cf076a..00f6460d5a 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h index b47cfd3f08..4b9e4f34c4 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 180 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h index cc30cf076a..00f6460d5a 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h index 8225888494..41d31088ba 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -946,6 +943,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 185 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h index 8197880c9e..2fc9fe1e9b 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h index daf8e307ef..c7e392cd3f 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h @@ -166,7 +166,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -220,7 +219,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -238,7 +236,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -954,6 +951,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 320 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h index cf6a209d26..1d476cd3fc 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h index 845edbf43b..e307b8bbe7 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration.h +++ b/Marlin/src/config/examples/MakerParts/Configuration.h @@ -181,7 +181,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -235,7 +234,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -253,7 +251,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -962,6 +959,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h index 299596657e..10034616b8 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h +++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h index 2eed7cb804..33270aefe2 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h @@ -166,7 +166,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -220,7 +219,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -238,7 +236,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -966,6 +963,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 180 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h index 5c8e97210f..7fc4396d5c 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h index 0f382f6bd9..f84e5bd430 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -941,6 +938,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h index c8a3c94f26..0d7ee60982 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h index 6d8264315a..1cc5701a94 100644 --- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -946,6 +943,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 260 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h index 0de2b02554..de41764660 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -946,6 +943,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 260 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h index 0b7ddaebb3..ff46d74c4f 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h index f72b8d86f1..7fcfd2922e 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h index 5469be8cd2..2b891fed1f 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h index 39d5647f61..e7a6d7e0fb 100644 --- a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h +++ b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -991,6 +988,9 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 80 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h index 3285893547..b4cb052dcb 100644 --- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h index 79e13ecc5b..19529492a7 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration.h +++ b/Marlin/src/config/examples/RigidBot/Configuration.h @@ -164,7 +164,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -218,7 +217,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -236,7 +234,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -940,6 +937,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 254 // RigidBot regular and Big are 254mm +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h index 1f91721074..8d72828243 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h +++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h index 26e815ee3c..94fd6bf0df 100644 --- a/Marlin/src/config/examples/SCARA/Configuration.h +++ b/Marlin/src/config/examples/SCARA/Configuration.h @@ -192,7 +192,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -246,7 +245,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -264,7 +262,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -955,6 +952,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 225 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h index 269caf9051..01fb0eb64a 100644 --- a/Marlin/src/config/examples/SCARA/Configuration_adv.h +++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h index 31cebd2c68..4a470aad47 100644 --- a/Marlin/src/config/examples/STM32F10/Configuration.h +++ b/Marlin/src/config/examples/STM32F10/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -944,6 +941,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 180 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/STM32F4/Configuration.h b/Marlin/src/config/examples/STM32F4/Configuration.h index bf06093ce9..533b1016c3 100644 --- a/Marlin/src/config/examples/STM32F4/Configuration.h +++ b/Marlin/src/config/examples/STM32F4/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h index 51757e2519..6289873136 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -973,6 +970,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 170 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h index 43a4036b15..7c73a788d3 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h index d9ff574a77..f23075204b 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration.h +++ b/Marlin/src/config/examples/TheBorg/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h index f4d5cc0f5c..3aa388e9d4 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h +++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h index b5fccd4758..4559746588 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h @@ -183,7 +183,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -237,7 +236,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -255,7 +253,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -998,6 +995,9 @@ #define Z_MAX_POS 158 #endif +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h index 06b5e30131..fe4d1ccfd6 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h index 79ce6dce87..7cdf9e741c 100644 --- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 150 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h index 9eccfe4c9b..3d49a01fcc 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -946,6 +943,9 @@ #define Y_MAX_POS Y_BED_SIZE - (TRONXY_Y_BED_OFFSET + 5) #define Z_MAX_POS 316 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h index c163c33976..c9aa702e99 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h index 78e0618f06..72886332c6 100644 --- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 400 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h index 8661c2dfb4..ff847522ba 100644 --- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -953,6 +950,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 130 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h index 7c1c142635..c02e9baf22 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h index 0dd0864811..9891e1a30c 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h index 83b7838c92..8a4cea2473 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h @@ -181,7 +181,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -235,7 +234,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -253,7 +251,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -972,6 +969,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h index 9227455709..3d95866c17 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h @@ -398,10 +398,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h index 62e57049f9..58a3cc35ee 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 190 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h index f16875800e..5c2d8488ff 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h index e5c66c559a..59ff8551cb 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 190 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h index 2c88ef942d..c8e31cbecd 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -952,6 +949,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 170 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index 552d4dc078..f7018dd9e1 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h index 453a86055c..3b2b1fc922 100644 --- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h +++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -942,6 +939,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h index 626ce0b858..5803615670 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h @@ -176,7 +176,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -230,7 +229,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -248,7 +246,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1133,6 +1130,9 @@ #define Y_MAX_POS DELTA_PRINTABLE_RADIUS #define Z_MAX_POS MANUAL_Z_HOME_POS +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h index 4fce9640b9..bc53d54d52 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h index 4f330fd393..01d46ce10f 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1070,6 +1067,9 @@ #define Y_MAX_POS DELTA_PRINTABLE_RADIUS #define Z_MAX_POS MANUAL_Z_HOME_POS +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index 9334823608..57f2cab37a 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h index b5f85151ff..e0c5ce4a26 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1069,6 +1066,9 @@ #define Y_MAX_POS DELTA_PRINTABLE_RADIUS #define Z_MAX_POS MANUAL_Z_HOME_POS +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h index 9334823608..57f2cab37a 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h index f38018f3c3..b13eb035cb 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1069,6 +1066,9 @@ #define Y_MAX_POS DELTA_PRINTABLE_RADIUS #define Z_MAX_POS MANUAL_Z_HOME_POS +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index dc9c03d427..e334e09b2e 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h index c0da4c826b..f7dc2bcd54 100644 --- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h +++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h @@ -166,7 +166,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -220,7 +219,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -238,7 +236,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1072,6 +1069,9 @@ #define Y_MAX_POS DELTA_PRINTABLE_RADIUS #define Z_MAX_POS MANUAL_Z_HOME_POS +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h index 7ad335092a..6d44e66267 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration.h +++ b/Marlin/src/config/examples/delta/generic/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1057,6 +1054,9 @@ #define Y_MAX_POS DELTA_PRINTABLE_RADIUS #define Z_MAX_POS MANUAL_Z_HOME_POS +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h index dc9c03d427..e334e09b2e 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h index 358428310f..7d9bf06be9 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1059,6 +1056,9 @@ #define Y_MAX_POS DELTA_PRINTABLE_RADIUS #define Z_MAX_POS MANUAL_Z_HOME_POS +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h index dc9c03d427..e334e09b2e 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h index 1bb660bc22..5faca4cfdb 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h @@ -165,7 +165,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -219,7 +218,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -237,7 +235,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1060,6 +1057,9 @@ #define Y_MAX_POS DELTA_PRINTABLE_RADIUS #define Z_MAX_POS MANUAL_Z_HOME_POS +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h index bfa24111be..ef2e13d8c9 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -1060,6 +1057,9 @@ #define Y_MAX_POS DELTA_PRINTABLE_RADIUS #define Z_MAX_POS MANUAL_Z_HOME_POS +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h index a4899484d5..009cca6319 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h index fa448ca9f4..e1a5be287e 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h @@ -166,7 +166,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -220,7 +219,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -238,7 +236,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -956,6 +953,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 500 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h index af27fce273..58d3650026 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h index 74beffcb47..76be60c6b8 100644 --- a/Marlin/src/config/examples/makibox/Configuration.h +++ b/Marlin/src/config/examples/makibox/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -945,6 +942,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 86 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h index 15ae5a8d94..d54a469f53 100644 --- a/Marlin/src/config/examples/makibox/Configuration_adv.h +++ b/Marlin/src/config/examples/makibox/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h index 174d59e422..b757d9db7e 100644 --- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h +++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -944,6 +941,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 180 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h index 74c3f338dd..cb295a9ea0 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -937,6 +934,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 120 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h index 53ec856b89..9a014fefa7 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h index 2101b8fd5f..bbefec045c 100644 --- a/Marlin/src/config/examples/wt150/Configuration.h +++ b/Marlin/src/config/examples/wt150/Configuration.h @@ -161,7 +161,6 @@ #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2 // (mm) #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) @@ -215,7 +214,6 @@ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined. #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder - #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 #endif @@ -233,7 +231,6 @@ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders - #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking #endif /** @@ -947,6 +944,9 @@ #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 143.0 +// Z raise distance for tool-change, as needed for some extruders +#define TOOLCHANGE_ZRAISE 2 // (mm) + /** * Software Endstops * diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h index 7394815d15..89cfeca622 100644 --- a/Marlin/src/config/examples/wt150/Configuration_adv.h +++ b/Marlin/src/config/examples/wt150/Configuration_adv.h @@ -385,10 +385,6 @@ // This is the default power-up mode which can be later using M605. #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - // Default x offset in duplication mode (typically set to half print bed width) #define DEFAULT_DUPLICATION_X_OFFSET 100 diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp index 454aa7eeb4..f928e42b57 100644 --- a/Marlin/src/gcode/config/M217.cpp +++ b/Marlin/src/gcode/config/M217.cpp @@ -22,7 +22,7 @@ #include "../../inc/MarlinConfigPre.h" -#if ENABLED(SINGLENOZZLE) +#if EXTRUDERS > 1 #include "../gcode.h" #include "../../module/tool_change.h" @@ -32,18 +32,25 @@ #endif void M217_report(const bool eeprom=false) { + #if NUM_SERIAL > 1 const int16_t port = command_queue_port[cmd_queue_index_r]; #endif - serialprintPGM_P(port, eeprom ? PSTR(" M217") : PSTR("Singlenozzle:")); - SERIAL_ECHOPAIR_P(port, " S", LINEAR_UNIT(sn_settings.swap_length)); - SERIAL_ECHOPAIR_P(port, " P", LINEAR_UNIT(sn_settings.prime_speed)); - SERIAL_ECHOPAIR_P(port, " R", LINEAR_UNIT(sn_settings.retract_speed)); - #if ENABLED(SINGLENOZZLE_SWAP_PARK) - SERIAL_ECHOPAIR_P(port, " X", LINEAR_UNIT(sn_settings.change_point.x)); - SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(sn_settings.change_point.y)); + + #if ENABLED(SINGLENOZZLE) + serialprintPGM_P(port, eeprom ? PSTR(" M217") : PSTR("Singlenozzle:")); + SERIAL_ECHOPAIR_P(port, " S", LINEAR_UNIT(toolchange_settings.swap_length)); + SERIAL_ECHOPAIR_P(port, " P", LINEAR_UNIT(toolchange_settings.prime_speed)); + SERIAL_ECHOPAIR_P(port, " R", LINEAR_UNIT(toolchange_settings.retract_speed)); + + #if ENABLED(SINGLENOZZLE_SWAP_PARK) + SERIAL_ECHOPAIR_P(port, " X", LINEAR_UNIT(toolchange_settings.change_point.x)); + SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(toolchange_settings.change_point.y)); + #endif + #endif - SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(sn_settings.z_raise)); + + SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(toolchange_settings.z_raise)); SERIAL_EOL(); } @@ -61,19 +68,23 @@ void GcodeSuite::M217() { bool report = true; - if (parser.seenval('S')) { report = false; const float v = parser.value_linear_units(); sn_settings.swap_length = constrain(v, 0, 500); } - if (parser.seenval('P')) { report = false; const int16_t v = parser.value_linear_units(); sn_settings.prime_speed = constrain(v, 10, 5400); } - if (parser.seenval('R')) { report = false; const int16_t v = parser.value_linear_units(); sn_settings.retract_speed = constrain(v, 10, 5400); } + #if ENABLED(SINGLENOZZLE) + + if (parser.seenval('S')) { report = false; const float v = parser.value_linear_units(); toolchange_settings.swap_length = constrain(v, 0, 500); } + if (parser.seenval('P')) { report = false; const int16_t v = parser.value_linear_units(); toolchange_settings.prime_speed = constrain(v, 10, 5400); } + if (parser.seenval('R')) { report = false; const int16_t v = parser.value_linear_units(); toolchange_settings.retract_speed = constrain(v, 10, 5400); } + + #if ENABLED(SINGLENOZZLE_SWAP_PARK) + if (parser.seenval('X')) { report = false; toolchange_settings.change_point.x = parser.value_linear_units(); } + if (parser.seenval('Y')) { report = false; toolchange_settings.change_point.y = parser.value_linear_units(); } + #endif - #if ENABLED(SINGLENOZZLE_SWAP_PARK) - if (parser.seenval('X')) { report = false; sn_settings.change_point.x = parser.value_linear_units(); } - if (parser.seenval('Y')) { report = false; sn_settings.change_point.y = parser.value_linear_units(); } #endif - if (parser.seenval('Z')) { report = false; sn_settings.z_raise = parser.value_linear_units(); } + if (parser.seenval('Z')) { report = false; toolchange_settings.z_raise = parser.value_linear_units(); } if (report) M217_report(); } -#endif // SINGLENOZZLE +#endif // EXTRUDERS > 1 diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp index 780a7f57b5..3530881f50 100644 --- a/Marlin/src/gcode/control/M605.cpp +++ b/Marlin/src/gcode/control/M605.cpp @@ -22,10 +22,10 @@ #include "../../inc/MarlinConfig.h" -#define DEBUG_DXC_MODE - #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE) +//#define DEBUG_DXC_MODE + #include "../gcode.h" #include "../../module/motion.h" #include "../../module/stepper.h" @@ -99,50 +99,52 @@ else if (!parser.seen('W')) // if no S or W parameter, the DXC mode gets reset to the user's default dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE; - if (parser.seen('W')) { - SERIAL_ECHO_START(); - SERIAL_ECHOPGM("IDEX mode: "); - switch (dual_x_carriage_mode) { - case DXC_FULL_CONTROL_MODE: SERIAL_ECHOPGM("DXC_FULL_CONTROL_MODE"); break; - case DXC_AUTO_PARK_MODE: SERIAL_ECHOPGM("DXC_AUTO_PARK_MODE"); break; - case DXC_DUPLICATION_MODE: SERIAL_ECHOPGM("DXC_DUPLICATION_MODE"); break; - case DXC_SCALED_DUPLICATION_MODE: SERIAL_ECHOPGM("DXC_SCALED_DUPLICATION_MODE"); break; - } - SERIAL_ECHOPAIR("\nActive Ext: ", int(active_extruder)); - if (!active_extruder_parked) SERIAL_ECHOPGM(" NOT "); - SERIAL_ECHOPGM(" parked."); - SERIAL_ECHOPAIR("\nactive_extruder_x_pos: ", current_position[X_AXIS]); - SERIAL_ECHOPAIR("\ninactive_extruder_x_pos: ", inactive_extruder_x_pos); - SERIAL_ECHOPAIR("\nextruder_duplication_enabled: ", int(extruder_duplication_enabled)); - SERIAL_ECHOPAIR("\nduplicate_extruder_x_offset: ", duplicate_extruder_x_offset); - SERIAL_ECHOPAIR("\nduplicate_extruder_temp_offset: ", duplicate_extruder_temp_offset); - SERIAL_ECHOPAIR("\ndelayed_move_time: ", delayed_move_time); - SERIAL_ECHOPAIR("\nX1 Home X: ", x_home_pos(0)); - SERIAL_ECHOPAIR("\nX1_MIN_POS=", int(X1_MIN_POS)); - SERIAL_ECHOPAIR("\nX1_MAX_POS=", int(X1_MAX_POS)); - SERIAL_ECHOPAIR("\nX2 Home X: ", x_home_pos(1)); - SERIAL_ECHOPAIR("\nX2_MIN_POS=", int(X2_MIN_POS)); - SERIAL_ECHOPAIR("\nX2_MAX_POS=", int(X2_MAX_POS)); - SERIAL_ECHOPAIR("\nX2_HOME_DIR=", int(X2_HOME_DIR)); - SERIAL_ECHOPAIR("\nX2_HOME_POS=", int(X2_HOME_POS)); - SERIAL_ECHOPAIR("\nDEFAULT_DUAL_X_CARRIAGE_MODE=", STRINGIFY(DEFAULT_DUAL_X_CARRIAGE_MODE)); - SERIAL_ECHOPAIR("\nTOOLCHANGE_PARK_ZLIFT=", float(TOOLCHANGE_PARK_ZLIFT)); - SERIAL_ECHOPAIR("\nTOOLCHANGE_UNPARK_ZLIFT=", float(TOOLCHANGE_UNPARK_ZLIFT)); - SERIAL_ECHOPAIR("\nDEFAULT_DUPLICATION_X_OFFSET=", int(DEFAULT_DUPLICATION_X_OFFSET)); + #ifdef DEBUG_DXC_MODE - SERIAL_EOL(); - for (uint8_t i = 0; i < 2; i++) { - SERIAL_ECHOPAIR(" nozzle:", int(i)); - LOOP_XYZ(j) { - SERIAL_ECHOPGM(" hotend_offset["); - SERIAL_CHAR(axis_codes[j]); - SERIAL_ECHOPAIR("_AXIS][", int(i)); - SERIAL_ECHOPAIR("]=", hotend_offset[j][i]); + if (parser.seen('W')) { + SERIAL_ECHO_START(); + SERIAL_ECHOPGM("IDEX mode: "); + switch (dual_x_carriage_mode) { + case DXC_FULL_CONTROL_MODE: SERIAL_ECHOPGM("DXC_FULL_CONTROL_MODE"); break; + case DXC_AUTO_PARK_MODE: SERIAL_ECHOPGM("DXC_AUTO_PARK_MODE"); break; + case DXC_DUPLICATION_MODE: SERIAL_ECHOPGM("DXC_DUPLICATION_MODE"); break; + case DXC_SCALED_DUPLICATION_MODE: SERIAL_ECHOPGM("DXC_SCALED_DUPLICATION_MODE"); break; + } + SERIAL_ECHOPAIR("\nActive Ext: ", int(active_extruder)); + if (!active_extruder_parked) SERIAL_ECHOPGM(" NOT "); + SERIAL_ECHOPGM(" parked."); + SERIAL_ECHOPAIR("\nactive_extruder_x_pos: ", current_position[X_AXIS]); + SERIAL_ECHOPAIR("\ninactive_extruder_x_pos: ", inactive_extruder_x_pos); + SERIAL_ECHOPAIR("\nextruder_duplication_enabled: ", int(extruder_duplication_enabled)); + SERIAL_ECHOPAIR("\nduplicate_extruder_x_offset: ", duplicate_extruder_x_offset); + SERIAL_ECHOPAIR("\nduplicate_extruder_temp_offset: ", duplicate_extruder_temp_offset); + SERIAL_ECHOPAIR("\ndelayed_move_time: ", delayed_move_time); + SERIAL_ECHOPAIR("\nX1 Home X: ", x_home_pos(0)); + SERIAL_ECHOPAIR("\nX1_MIN_POS=", int(X1_MIN_POS)); + SERIAL_ECHOPAIR("\nX1_MAX_POS=", int(X1_MAX_POS)); + SERIAL_ECHOPAIR("\nX2 Home X: ", x_home_pos(1)); + SERIAL_ECHOPAIR("\nX2_MIN_POS=", int(X2_MIN_POS)); + SERIAL_ECHOPAIR("\nX2_MAX_POS=", int(X2_MAX_POS)); + SERIAL_ECHOPAIR("\nX2_HOME_DIR=", int(X2_HOME_DIR)); + SERIAL_ECHOPAIR("\nX2_HOME_POS=", int(X2_HOME_POS)); + SERIAL_ECHOPAIR("\nDEFAULT_DUAL_X_CARRIAGE_MODE=", STRINGIFY(DEFAULT_DUAL_X_CARRIAGE_MODE)); + SERIAL_ECHOPAIR("\nTOOLCHANGE_ZRAISE=", float(TOOLCHANGE_ZRAISE)); + SERIAL_ECHOPAIR("\nDEFAULT_DUPLICATION_X_OFFSET=", int(DEFAULT_DUPLICATION_X_OFFSET)); + SERIAL_EOL(); + + for (uint8_t i = 0; i < 2; i++) { + SERIAL_ECHOPAIR(" nozzle:", int(i)); + LOOP_XYZ(j) { + SERIAL_ECHOPGM(" hotend_offset["); + SERIAL_CHAR(axis_codes[j]); + SERIAL_ECHOPAIR("_AXIS][", int(i)); + SERIAL_ECHOPAIR("]=", hotend_offset[j][i]); + } + SERIAL_EOL(); } SERIAL_EOL(); } - SERIAL_EOL(); - } + #endif // DEBUG_DXC_MODE } #elif ENABLED(DUAL_NOZZLE_DUPLICATION_MODE) diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index 0185676821..4de056de7a 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -481,7 +481,7 @@ void GcodeSuite::process_parsed_command( case 211: M211(); break; // M211: Enable, Disable, and/or Report software endstops - #if ENABLED(SINGLENOZZLE) + #if EXTRUDERS > 1 case 217: M217(); break; // M217: Set filament swap parameters #endif diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h index ec2d3fe26b..8a8a9b0076 100644 --- a/Marlin/src/gcode/gcode.h +++ b/Marlin/src/gcode/gcode.h @@ -612,7 +612,7 @@ private: static void M211(); - #if ENABLED(SINGLENOZZLE) + #if EXTRUDERS > 1 static void M217(); #endif diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 8d2bda76ce..0647c180cc 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -311,6 +311,14 @@ #error "ENDSTOP_NOISE_FILTER is now ENDSTOP_NOISE_THRESHOLD [2-7]. Please update your configuration." #elif defined(RETRACT_ZLIFT) #error "RETRACT_ZLIFT is now RETRACT_ZRAISE. Please update your Configuration_adv.h." +#elif defined(TOOLCHANGE_PARK_ZLIFT) || defined(TOOLCHANGE_UNPARK_ZLIFT) + #error "TOOLCHANGE_PARK_ZLIFT and TOOLCHANGE_UNPARK_ZLIFT are now TOOLCHANGE_ZRAISE. Please update your configuration." +#elif defined(SINGLENOZZLE_TOOLCHANGE_ZRAISE) + #error "SINGLENOZZLE_TOOLCHANGE_ZRAISE is now TOOLCHANGE_ZRAISE. Please update your configuration." +#elif defined(PARKING_EXTRUDER_SECURITY_RAISE) + #error "PARKING_EXTRUDER_SECURITY_RAISE is now TOOLCHANGE_ZRAISE. Please update your configuration." +#elif defined(SWITCHING_TOOLHEAD_SECURITY_RAISE) + #error "SWITCHING_TOOLHEAD_SECURITY_RAISE is now TOOLCHANGE_ZRAISE. Please update your configuration." #endif #define BOARD_MKS_13 -47 @@ -619,8 +627,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE, #error "SINGLENOZZLE_SWAP_PARK requires SINGLENOZZLE_PARK_XY_FEEDRATE. Please update your Configuration." #endif #else - #ifndef SINGLENOZZLE_TOOLCHANGE_ZRAISE - #error "SINGLENOZZLE requires SINGLENOZZLE_TOOLCHANGE_ZRAISE. Please update your Configuration." + #ifndef TOOLCHANGE_ZRAISE + #error "SINGLENOZZLE requires TOOLCHANGE_ZRAISE. Please update your Configuration." #endif #endif #endif @@ -736,10 +744,10 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE, #error "PARKING_EXTRUDER requires SOL0_PIN and SOL1_PIN." #elif !defined(PARKING_EXTRUDER_PARKING_X) #error "PARKING_EXTRUDER requires PARKING_EXTRUDER_PARKING_X." - #elif !defined(PARKING_EXTRUDER_SECURITY_RAISE) - #error "PARKING_EXTRUDER requires PARKING_EXTRUDER_SECURITY_RAISE." - #elif PARKING_EXTRUDER_SECURITY_RAISE < 0 - #error "PARKING_EXTRUDER_SECURITY_RAISE must be 0 or higher." + #elif !defined(TOOLCHANGE_ZRAISE) + #error "PARKING_EXTRUDER requires TOOLCHANGE_ZRAISE." + #elif TOOLCHANGE_ZRAISE < 0 + #error "TOOLCHANGE_ZRAISE must be 0 or higher." #elif !defined(PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE) || !WITHIN(PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE, LOW, HIGH) #error "PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE must be defined as HIGH or LOW." #elif !defined(PARKING_EXTRUDER_SOLENOIDS_DELAY) || !WITHIN(PARKING_EXTRUDER_SOLENOIDS_DELAY, 0, 2000) @@ -771,10 +779,10 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE, #elif SWITCHING_TOOLHEAD_SERVO_NR == 3 #error "A SWITCHING_TOOLHEAD_SERVO_NR of 3 requires NUM_SERVOS >= 4." #endif - #elif !defined(SWITCHING_TOOLHEAD_SECURITY_RAISE) - #error "SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_SECURITY_RAISE." - #elif SWITCHING_TOOLHEAD_SECURITY_RAISE < 0 - #error "SWITCHING_TOOLHEAD _SECURITY_RAISE must be 0 or higher." + #elif !defined(TOOLCHANGE_ZRAISE) + #error "SWITCHING_TOOLHEAD requires TOOLCHANGE_ZRAISE." + #elif TOOLCHANGE_ZRAISE < 0 + #error "TOOLCHANGE_ZRAISE must be 0 or higher." #endif #endif diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 547f306bbb..384068d7b4 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -777,8 +777,11 @@ #ifndef MSG_FILAMENT_SWAP_LENGTH #define MSG_FILAMENT_SWAP_LENGTH _UxGT("Retract Distance") #endif -#ifndef MSG_SINGLENOZZLE_TOOL_CHANGE - #define MSG_SINGLENOZZLE_TOOL_CHANGE _UxGT("Tool Change") +#ifndef MSG_TOOL_CHANGE + #define MSG_TOOL_CHANGE _UxGT("Tool Change") +#endif +#ifndef MSG_TOOL_CHANGE_ZLIFT + #define MSG_TOOL_CHANGE_ZLIFT _UxGT("Z Raise") #endif #ifndef MSG_SINGLENOZZLE_PRIME_SPD #define MSG_SINGLENOZZLE_PRIME_SPD _UxGT("Prime Speed") diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index 84747743ce..e94a9264a0 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -976,13 +976,16 @@ void lcd_quick_feedback(const bool clear_buttons) { #endif // POWER_LOSS_RECOVERY - #if ENABLED(SINGLENOZZLE) - void singlenozzle_swap_menu() { + #if EXTRUDERS > 1 + void tool_change_menu() { START_MENU(); MENU_BACK(MSG_MAIN); - MENU_ITEM_EDIT(float3, MSG_FILAMENT_SWAP_LENGTH, &sn_settings.swap_length, 0, 200); - MENU_MULTIPLIER_ITEM_EDIT(int4, MSG_SINGLENOZZLE_RETRACT_SPD, &sn_settings.retract_speed, 10, 5400); - MENU_MULTIPLIER_ITEM_EDIT(int4, MSG_SINGLENOZZLE_PRIME_SPD, &sn_settings.prime_speed, 10, 5400); + #if ENABLED(SINGLENOZZLE) + MENU_ITEM_EDIT(float3, MSG_FILAMENT_SWAP_LENGTH, &toolchange_settings.swap_length, 0, 200); + MENU_MULTIPLIER_ITEM_EDIT(int4, MSG_SINGLENOZZLE_RETRACT_SPD, &toolchange_settings.retract_speed, 10, 5400); + MENU_MULTIPLIER_ITEM_EDIT(int4, MSG_SINGLENOZZLE_PRIME_SPD, &toolchange_settings.prime_speed, 10, 5400); + #endif + MENU_ITEM_EDIT(float3, MSG_TOOL_CHANGE_ZLIFT, &toolchange_settings.z_raise, 0, 10); END_MENU(); } #endif @@ -3437,8 +3440,8 @@ void lcd_quick_feedback(const bool clear_buttons) { // // Set single nozzle filament retract and prime length // - #if ENABLED(SINGLENOZZLE) - MENU_ITEM(submenu, MSG_SINGLENOZZLE_TOOL_CHANGE, singlenozzle_swap_menu); + #if EXTRUDERS > 1 + MENU_ITEM(submenu, MSG_TOOL_CHANGE, tool_change_menu); #endif // diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index c359710ab3..bb3e341cb1 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -89,7 +89,7 @@ #include "../feature/pause.h" #endif -#if ENABLED(SINGLENOZZLE) +#if EXTRUDERS > 1 #include "tool_change.h" void M217_report(const bool eeprom); #endif @@ -275,8 +275,8 @@ typedef struct SettingsDataStruct { // // SINGLENOZZLE toolchange values // - #if ENABLED(SINGLENOZZLE) - singlenozzle_settings_t sn_settings; // M217 S P R + #if EXTRUDERS > 1 + toolchange_settings_t toolchange_settings; // M217 S P R #endif } SettingsData; @@ -945,8 +945,8 @@ void MarlinSettings::postprocess() { // #if ENABLED(SINGLENOZZLE) - _FIELD_TEST(sn_settings); - EEPROM_WRITE(sn_settings); + _FIELD_TEST(toolchange_settings); + EEPROM_WRITE(toolchange_settings); #endif // @@ -1573,8 +1573,8 @@ void MarlinSettings::postprocess() { // SINGLENOZZLE toolchange values // #if ENABLED(SINGLENOZZLE) - _FIELD_TEST(sn_settings); - EEPROM_READ(sn_settings); + _FIELD_TEST(toolchange_settings); + EEPROM_READ(toolchange_settings); #endif eeprom_error = size_error(eeprom_index - (EEPROM_OFFSET)); @@ -1835,13 +1835,16 @@ void MarlinSettings::reset(PORTARG_SOLO) { #endif #endif + #if EXTRUDERS > 1 + toolchange_settings.z_raise = TOOLCHANGE_ZRAISE; + #endif + #if ENABLED(SINGLENOZZLE) - sn_settings.swap_length = SINGLENOZZLE_SWAP_LENGTH; - sn_settings.prime_speed = SINGLENOZZLE_SWAP_PRIME_SPEED; - sn_settings.retract_speed = SINGLENOZZLE_SWAP_RETRACT_SPEED; - sn_settings.z_raise = SINGLENOZZLE_TOOLCHANGE_ZRAISE; + toolchange_settings.swap_length = SINGLENOZZLE_SWAP_LENGTH; + toolchange_settings.prime_speed = SINGLENOZZLE_SWAP_PRIME_SPEED; + toolchange_settings.retract_speed = SINGLENOZZLE_SWAP_RETRACT_SPEED; #if ENABLED(SINGLENOZZLE_SWAP_PARK) - sn_settings.change_point = SINGLENOZZLE_TOOLCHANGE_XY; + toolchange_settings.change_point = SINGLENOZZLE_TOOLCHANGE_XY; #endif #endif diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index 57ad09dc0d..d7fffae072 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -20,6 +20,8 @@ * */ +#include "../inc/MarlinConfigPre.h" + #include "tool_change.h" #include "probe.h" @@ -29,8 +31,11 @@ #include "../Marlin.h" +#if EXTRUDERS > 1 + toolchange_settings_t toolchange_settings; // Initialized by settings.load() +#endif + #if ENABLED(SINGLENOZZLE) - singlenozzle_settings_t sn_settings; // Initialized by settings.load() uint16_t singlenozzle_temp[EXTRUDERS]; #if FAN_COUNT > 0 uint8_t singlenozzle_fan_speed[EXTRUDERS]; @@ -142,7 +147,7 @@ #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) DEBUG_POS("Start Autopark", current_position); #endif - current_position[Z_AXIS] += PARKING_EXTRUDER_SECURITY_RAISE; + current_position[Z_AXIS] += toolchange_settings.z_raise; #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) DEBUG_POS("(1) Raise Z-Axis", current_position); #endif @@ -249,7 +254,7 @@ #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) DEBUG_POS("Starting Toolhead change", current_position); #endif - current_position[Z_AXIS] += SWITCHING_TOOLHEAD_SECURITY_RAISE; + current_position[Z_AXIS] += toolchange_settings.z_raise; #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) DEBUG_POS("(1) Raise Z-Axis", current_position); #endif @@ -376,7 +381,7 @@ inline void invalid_extruder_error(const uint8_t e) { && IsRunning() && (delayed_move_time || current_position[X_AXIS] != xhome) ) { - float raised_z = current_position[Z_AXIS] + TOOLCHANGE_PARK_ZLIFT; + float raised_z = current_position[Z_AXIS] + toolchange_settings.z_raise; #if ENABLED(MAX_SOFTWARE_ENDSTOPS) NOMORE(raised_z, soft_endstop_max[Z_AXIS]); #endif @@ -428,7 +433,7 @@ inline void invalid_extruder_error(const uint8_t e) { case DXC_AUTO_PARK_MODE: // record raised toolhead position for use by unpark COPY(raised_parked_position, current_position); - raised_parked_position[Z_AXIS] += TOOLCHANGE_UNPARK_ZLIFT; + raised_parked_position[Z_AXIS] += toolchange_settings.z_raise; #if ENABLED(MAX_SOFTWARE_ENDSTOPS) NOMORE(raised_parked_position[Z_AXIS], soft_endstop_max[Z_AXIS]); #endif @@ -542,8 +547,8 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n #else const float zdiff = hotend_offset[Z_AXIS][tmp_extruder] - hotend_offset[Z_AXIS][active_extruder]; #if ENABLED(SWITCHING_NOZZLE) - // Always raise by at least 1 to avoid workpiece - current_position[Z_AXIS] += MAX(-zdiff, 0.0) + 1; + // Always raise by a configured distance to avoid workpiece + current_position[Z_AXIS] += MAX(-zdiff, 0.0) + toolchange_settings.z_raise; planner.buffer_line(current_position, planner.settings.max_feedrate_mm_s[Z_AXIS], active_extruder); move_nozzle_servo(tmp_extruder); #endif @@ -582,7 +587,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n if (safe_to_move && !no_move && IsRunning()) { #if DISABLED(SWITCHING_NOZZLE) // Do a small lift to avoid the workpiece in the move back (below) - current_position[Z_AXIS] += 1.0; + current_position[Z_AXIS] += toolchange_settings.z_raise; planner.buffer_line(current_position, planner.settings.max_feedrate_mm_s[Z_AXIS], active_extruder); #endif #if ENABLED(DEBUG_LEVELING_FEATURE) @@ -635,7 +640,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n #if ENABLED(SINGLENOZZLE) #if ENABLED(PREVENT_COLD_EXTRUSION) - if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder) && sn_settings.swap_length) { + if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder) && toolchange_settings.swap_length) { SERIAL_ERROR_START(); SERIAL_ERRORLNPGM(MSG_HOTEND_TOO_COLD); active_extruder = tmp_extruder; @@ -648,12 +653,12 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n fan_speed[0] = singlenozzle_fan_speed[tmp_extruder]; #endif - if (sn_settings.swap_length) { + if (toolchange_settings.swap_length) { #if ENABLED(ADVANCED_PAUSE_FEATURE) - do_pause_e_move(-sn_settings.swap_length, MMM_TO_MMS(sn_settings.retract_speed)); + do_pause_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed)); #else - current_position[E_AXIS] -= sn_settings.swap_length / planner.e_factor[active_extruder]; - planner.buffer_line(current_position, MMM_TO_MMS(sn_settings.retract_speed), active_extruder); + current_position[E_AXIS] -= toolchange_settings.swap_length / planner.e_factor[active_extruder]; + planner.buffer_line(current_position, MMM_TO_MMS(toolchange_settings.retract_speed), active_extruder); #endif } @@ -671,10 +676,10 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n COPY(old_pos, current_position); #if ENABLED(SINGLENOZZLE_SWAP_PARK) - current_position[X_AXIS] = sn_settings.change_point.x; - current_position[Y_AXIS] = sn_settings.change_point.y; + current_position[X_AXIS] = toolchange_settings.change_point.x; + current_position[Y_AXIS] = toolchange_settings.change_point.y; #endif - current_position[Z_AXIS] += sn_settings.z_raise; + current_position[Z_AXIS] += toolchange_settings.z_raise; do_blocking_move_to(current_position, snfr); } @@ -690,12 +695,12 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n active_extruder = tmp_extruder; - if (sn_settings.swap_length) { + if (toolchange_settings.swap_length) { #if ENABLED(ADVANCED_PAUSE_FEATURE) - do_pause_e_move(sn_settings.swap_length, sn_settings.prime_speed); + do_pause_e_move(toolchange_settings.swap_length, toolchange_settings.prime_speed); #else - current_position[E_AXIS] += sn_settings.swap_length / planner.e_factor[tmp_extruder]; - planner.buffer_line(current_position, sn_settings.prime_speed, tmp_extruder); + current_position[E_AXIS] += toolchange_settings.swap_length / planner.e_factor[tmp_extruder]; + planner.buffer_line(current_position, toolchange_settings.prime_speed, tmp_extruder); #endif } diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h index d3851f89a4..b823278041 100644 --- a/Marlin/src/module/tool_change.h +++ b/Marlin/src/module/tool_change.h @@ -23,6 +23,21 @@ #include "../inc/MarlinConfigPre.h" +#if EXTRUDERS > 1 + + typedef struct { + float swap_length; + int16_t prime_speed, retract_speed; + #if ENABLED(SINGLENOZZLE_SWAP_PARK) + struct { float x, y; } change_point; + #endif + float z_raise = TOOLCHANGE_ZRAISE; + } toolchange_settings_t; + + extern toolchange_settings_t toolchange_settings; + +#endif + #if DO_SWITCH_EXTRUDER void move_extruder_servo(const uint8_t e); #endif @@ -49,21 +64,14 @@ #endif // PARKING_EXTRUDER #if ENABLED(SINGLENOZZLE) - typedef struct { - float swap_length; - int16_t prime_speed, retract_speed; - #if ENABLED(SINGLENOZZLE_SWAP_PARK) - struct { float x, y; } change_point; - #endif - float z_raise; - } singlenozzle_settings_t; - extern singlenozzle_settings_t sn_settings; extern uint16_t singlenozzle_temp[EXTRUDERS]; #if FAN_COUNT > 0 extern uint8_t singlenozzle_fan_speed[EXTRUDERS]; #endif #endif +extern float z_raise; + /** * Perform a tool-change, which may result in moving the * previous tool out of the way and the new tool into place.