diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index bdfb99446cbc1baa10ca28a48d7e3071635b7a75..1ab2080bfbac30b3d4dd389dfee6785d659bd1d5 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 9f795a13a00bb4cf4c77a15c0a952b85ac7730da..f1e814126c71bd4680ff8e1c339282ce03a28a35 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 bdfb99446cbc1baa10ca28a48d7e3071635b7a75..1ab2080bfbac30b3d4dd389dfee6785d659bd1d5 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 9f795a13a00bb4cf4c77a15c0a952b85ac7730da..f1e814126c71bd4680ff8e1c339282ce03a28a35 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 d8433f57f05fd71218c0295be3608d9cfa98a7c9..76b3e274dea15fef592b6e9bb07a7ed8aa8f5f72 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 15a4e0b6c786c5ce70cb5ca93b7b9f1fe1c2d5e5..47f259c137998616d69c5b6f249b1bcf3717ff3d 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 28b048ee7b0b4b73f12b20bdef1f9ba0b6615328..de54cd719d5256f8c465ecff563ead8a15e89924 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 b938765c30e8f3762f12c7160d8d4d183a8eb6b7..e8e7f4213b504364e146dcffb5dbb98e0fce2958 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 41c12da14a4118075cbb7eb0034ae489ef37b09e..ca6ee47fe89fb02a500dc9fe49b5821b40c1720d 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 aebaff1d9d69d5b9f5d058acd0a9a36ea694bc13..490c6ee0028076474cd0bdf7c1568ce68ed9d2a5 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 41c12da14a4118075cbb7eb0034ae489ef37b09e..ca6ee47fe89fb02a500dc9fe49b5821b40c1720d 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 8848523ec8659f419ae4068a01f1e2cb5fe3ceda..751ac0a4f489aceb259d60e7f4163151ac78f76b 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 75a17f0027fd88d82f022935547b138611386f0c..ae87f8dd59060fac3e73ac101f7ffa35f1875c42 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 ad5b725ccc5608e992ed0cae1e81ae51faf03d15..8edffae41f82fffbed7ee3ac3181a925f7d0f711 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 482bd44f7bb8ef6f613f631fdbce888af28f5fcf..850c265094ad5c5d5b0c6bd3851450e31dd59225 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 628b35460b42e01d35d3c05a1f56dd805c65527a..cf5bbf3218e4eb5c4eb47f66ff0a072360a83b90 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 7510b7500d763e793ce7c57412bf7f3575708ada..b53124d944e4045540e1e429601c1cd8a05d9cd4 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 1ea10aece0e2902722f1b0cd5bc57d3ae6947983..bfe6aa540342ac2ed5427d6ecd735aa5c7421736 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 00d1c34ea91e286c8df21a4ebb8fdffc53fb978e..de5e0ca7fb6c37e4fafab64fccd58431eb54f32a 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 7f82981042feb1165e50ca70378e9b838d2969f6..e4b24d0eafedc807dc03f8387a231bc9715035db 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 cbcea8178b65f02ffd4103101ccf2b7c6bd98caf..bde5f4e7ad09cdce1371a129d21bc53bbaedc2d6 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 13aade60b5adeab961a8b407bbcaeddabff7c9d1..e489d2671a9cecfa8c5a59be103d28d433cacaa0 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 972afadfe9c723666a410d6e9dd8aaf4d46a127c..57c6bfe1bda6ed0287a911e694e85e3a7e67dafc 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 6d3793ef13d7a3c909510e0933243548764d2fff..4f21e1adfa16e35683703c742d0a4f2f50566237 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 0eec5cdb315e05c2c47f15c1596d028385588742..f63c4dc9ddf526a9db490c50edbeecc7978c6c75 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 13aade60b5adeab961a8b407bbcaeddabff7c9d1..e489d2671a9cecfa8c5a59be103d28d433cacaa0 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 96259335d9039db055d596fbfdf363a4317ec030..a4ea69da343d29edc0f2b97ea57518b846dd92c8 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 6f333b1c56aca221a0fede9f6f43660c021b6b74..746dc90d821c13366990059fe970b035ae12bd9f 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 69fa9dfc7c89d2af6d2c3982da67f89428fb7b42..f9b7fba67553b532e9864e862e5af55f83fc6a64 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 e1c4b2ea7d5b13533823289c4f5c332bf1b18718..c6a21f8f7d5d776d2b76517ea018d0fb96882d6a 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 d176b2c7fe8eca1bd74cd36e9363913bedc67a91..f6bea2cb82cc12b09307ddf8e9f973292b9542dd 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 6acc8cf3b297994bc3c8376987c12a6434602bdb..b5b3cc3411daffdfa9671849d26e81f4c76ef64c 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 916ecad9a7f1988b53648528ed551044724c063f..c92bcc687abe5561b4f0be1386358bee78d144bd 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 f807c886e0ce19c2077e22c46f24becdd3c569d2..cec32a087bbc9cf1e1ec1092ce95926f0584c3f8 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 522637a81428085ed29704020a5bd7f76d37533b..fc5685b2898727797f3a425f0e52e7b2a396dbe4 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 4848b687f3b423c30ceb15ea75715d24c61c527e..7480258c14d0fbdb0b2388358d0b4fdd6e08232a 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 8d97099f4b5bc4aec9e478b9ea1500ae1a7cf13f..8c71757025c37721a93b5e38aba5df13c76eb215 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 4e26c30028e102c0c9ca06723c5e0169f1a95db2..0ac8d6640ded6146bffea3c732ebc9708cc5ebaf 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 6be61fad7c76775b8ffd2239c17591b738a1d40a..3726231f010a9e8ccd4e51b0bf0bfd1589f14bf3 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 4631bee7854eebde6edaca540e6f6ebb51d0f9bf..653869949b9a2d9578e557159b4b6c8a2012c948 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 1f02233c6ad51e159ad9c62d0df52c7aa711a7a4..79be3236d7373ba713dff172cfb50ebe912b1b93 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 9366866025a6c3bff147918ed11d3a0c06d9994e..af4e46ecfd50c75fee1324c1589dbeee3b98b29e 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 c0c66e8c19ddad87baa8c427a96e13ed0398b943..fb1e2049037fbefc18fdecf55ee1d76f348bfc9b 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 1be9a7b4ce704bd52bc6eab15e27737ae4cc6625..bf8825616480b452743773eef403dc6e99736814 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 89505e1a92581803cd94935ba4b89ad38668361d..a47edf3a4cb9c0321c1ae93877fce5e821760923 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 3a20d5d3255133a13a8a40ad2c6f6dff5a19b058..8d24dd6d58e5d11c3a441440f4b1f88e880ab91d 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 8e1d2c4418a27778f62b384514f9c5eaf920e36f..8711f20d36e88d7b9dc7004fac7cd3c4d0a5aa7d 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 71def1900b34065697b3177fdc7bf728da3903d4..5c2b304ca350fe04bc52efb410aedf406da1c0a8 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 a5110db4fae3a2e9097e59f00b236003cc61189c..7411ae83e5354484b4b358d26de71ddf8d2359a2 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 9d8d665f7b4772e4cd1b3d76d2b5050828bc7e18..16de187c812ef6b36c14c05ecdddc0888229b9a4 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 20bc3993a0438f56829736624624228ab1d7469d..24e950c4a453d125f9e7aaf5e99726655d54cef8 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 d987247f17816685912ccde31c04e1943df64bf9..12f924d0d6b647da17c7203e9ace379c970a19ab 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 bddecc9f0c13c033290e9004402dccf864e865a6..91357ca006c4ee7c9deda91160205a5d76790bf2 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 ff4c3eb2dab27bb4de9302a5fbbfe6a4a01a2ca4..744911f6abff9a33467d92b3dd75fac372430a33 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 285b993f3a568497f375c4f5e22dce775dbae4a8..9f4531b04a501ac901f8f9d7062ee2b12e08f4ff 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 e7e3def6ac9f68a40aaa5f5b88a54dd66a468132..c54a6e80bd3116ec953f4f6d275f90509d0e37e4 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 f280f59fade7d274668bf016bae409ef389c904d..73519dbef26a8c3c6c35101603338c00f6e5a609 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 d88b12af44c0caf0aa4cf4861354efd31a7c3cbe..97f9db39b772b48f74db4976f426f43176b72182 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 e4f48572b894fdb93eba7700cbefdb72dd212a51..89a466e9cb0c33b710df1ffb6d53ff9c1bf06565 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 d389db651d42b974cde33fb4a0821805bc20621c..330e30166a31470f2e173022efc3e20d5087e33f 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 9886496b0184d3b5dd0319229e2e61f9eb660210..5f6c6fdb95059be4e5b34f63153cc80c0598c100 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 e1b00990b1d486033f5daf3fefbab7e08721cef6..98e980c7427ccad7557006c0bf0d7012d04f3b42 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 cc30cf076a3e5e2256a7f7fffa600734dfd8d167..00f6460d5a9b2e32b978d91e714df17f1d8d9550 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 b47cfd3f084ef8b02e833e6ac53a8c0c91291133..4b9e4f34c47adfd5728f710107888fc450437ec1 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 cc30cf076a3e5e2256a7f7fffa600734dfd8d167..00f6460d5a9b2e32b978d91e714df17f1d8d9550 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 8225888494f8b58cf046a6532fe0ce1cb3046bae..41d31088bac3aa5fa9c8152776a9b50fe3db968e 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 8197880c9e5ab64eff68f74b6e2e5a5481913032..2fc9fe1e9b0be6c2dbf7ba931fb55d6d74a9f848 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 daf8e307ef6bd81509fb2bffe7bdb06850f4255e..c7e392cd3fec4e364f52331a97a851bf909da0cf 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 cf6a209d2623fb96e3ebb9790a60d76d20ac69a3..1d476cd3fc6808ebb33467bb3804af02a25f37f0 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 845edbf43b7aa1fc5ca0304d5b35ee39833e4e33..e307b8bbe7c7ad47ac5fa3287fff9b18528f54c3 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 299596657e1e593516cc44ef58fc372a2c66f948..10034616b8250e7af11c4241a9c51a57a3dbd14d 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 2eed7cb804aefe68fbc0d267d15e69b595ab7ee5..33270aefe257d1357d9753fa598373baa1c45f20 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 5c8e97210f482e7650a296fa8bc5d6fd31a05e40..7fc4396d5cc252b42a2f8ac165abfc61ad554b01 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 0f382f6bd9d9fb0981cd3eaaf07a3ea70a2ea727..f84e5bd430d99d8e08022f5dc7890836c04d61f1 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 c8a3c94f26175dd979c0fe0a644e4a30c3a84505..0d7ee60982e7ce8b1099aa5b27922e4b25d233aa 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 6d8264315a9355ee035178c32c4304484674cc14..1cc5701a9463a02e8886f55b1a71d387c90c08cc 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 0de2b02554ea6fe91fb873bc12b126b832ab39e5..de417646608df598bbca1720adc2178d8bc41c0b 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 0b7ddaebb36f70823999b8e9f3fc5da3d87ef9a7..ff46d74c4f9845737e7d417eaca3cd5e0e7d390e 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 f72b8d86f1345e537f9bf846e5b664cfd869ab82..7fcfd2922e5036176d4096a7e2b429ebb61a77ea 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 5469be8cd2efc33eb472e55b039ee11a694e96df..2b891fed1f98813afecc3c093739795a84d4c3ff 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 39d5647f61b8771b4a6ac99f3977c71f25a860f5..e7a6d7e0fbd61dc6872b119387f1b0ec5c72dbbc 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 3285893547d7dac2edb51d21e7d2c40290256893..b4cb052dcbdd275082c6c8825fece93ab6aaa232 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 79e13ecc5ba66664be39c89c635651e2bfc76613..19529492a75d3cf1c7edd8016c7ba3696374cf5d 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 1f91721074f75bf3114ef8647869af5a4c4c0c7d..8d72828243dd6bd176a2f47553ab398a9bfdc591 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 26e815ee3cff29008b96ec86218afa992ef7f4a3..94fd6bf0dfe4505494fb62b0bc01873267a6c9e9 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 269caf905110132e0bc87f47cb479fc36fc4d815..01fb0eb64a2725ef6a8c83217f98b889a261fa4c 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 31cebd2c68afcff09ec6ac77c1d777687e54450b..4a470aad478da31d6587a2337883a368283b8dd2 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 bf06093ce929b7606bd63ead367640ccc28b5d81..533b1016c39f02938ef44011e2565a65bd795186 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 51757e2519c1422bc9c950c24a749ad849d8b433..628987313612a807014dbc0eb284e73075f6d1c5 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 43a4036b15e4438b330b038985612f445f012c09..7c73a788d31a27d733188bd0520220c93545ea35 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 d9ff574a77ee7a1495241f64f78ff4a79d714104..f23075204bf253b8c8c6f91383f94288ee4b5a1f 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 f4d5cc0f5c2d9bc3b0f97323e513a88807720dc3..3aa388e9d4f8aceba6f16d0f7585e652715f4065 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 b5fccd47589bc62ad021cbedcbab09e8d98a6092..4559746588c62632dafbb6d413f6c66a4f00e184 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 06b5e301311dbb9bb267e058e5cab888ca92143b..fe4d1ccfd69a4c2d9483e0c0972a6b025de21faa 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 79ce6dce871925eba6612f4d00f3f9388c27d069..7cdf9e741c20e08a81d06d3b5654fe654611e125 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 9eccfe4c9b8a380e5d7ec7a904abc1dd106b03ff..3d49a01fcceefccb6ba811c942fee6207a5503ea 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 c163c33976dca689efd10337f39898fe7b98237c..c9aa702e99bac6f8cc366d2e221cbc4d03550672 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 78e0618f06198068a073a510165939a2f060d26c..72886332c6f47bf167308f151ad6b57f214ee5ec 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 8661c2dfb41db83bfae752f17d2cfc89cee3b773..ff847522bac53ba10b01aaeaf0270fb9aa5a6d26 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 7c1c14263500136db7e415768e8dd8745502b836..c02e9baf222cea82354c84b990802fdd41b29129 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 0dd0864811ad0f702d2d1cec80aed4c40c2aca91..9891e1a30cd3e35dd2c7f7f012bbee64db08cfad 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 83b7838c925a8732c362a7138ba505dae20c77bb..8a4cea2473cc8f53d8a33070a941ab8f8094bd05 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 92274557097faa899d641c90f00128f64aa7713b..3d95866c17b73a2592e435deacdd894dc8323e99 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 62e57049f92290546efa8b25bc25efd7151d1404..58a3cc35eeb3b38d616258e5215b08cc3e63ad61 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 f16875800ebacff6f1c3e928b0bfee457efd899f..5c2d8488ffb1d4e3e177bcdce59ae5ac23cceafd 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 e5c66c559abdbb606b1f8f5ff0c0391372b4bec9..59ff8551cb29d444884de0ed9b0c7c4b6e701b10 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 2c88ef942de21d9beed43b91e948f628ba87ba87..c8e31cbecdb395e18b94629c24cbfdac4632d9db 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 552d4dc078ba97dd834e2ad23e6625197aacf581..f7018dd9e110aee637c7e870027ad684cbbd6e7d 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 453a86055c35dd72d13797f7e37388cfc6c62905..3b2b1fc922b0bb5602422963fef2b6119b2716a5 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 626ce0b8586246968fc3c5c93279777feeaa0cce..580361567022e5d61028176f80f19e40129034d0 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 4fce9640b929a5b0f78f75871d6c0ab15a2a4adc..bc53d54d52ff898d8d57af5eb7d8c42c741a4697 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 4f330fd3932adb08bd0dfb3756da6c9dab7163c7..01d46ce10f9ed711df390e40a51fc92680ed92c8 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 93348236086e1be3fc8f00a9245825effaf7fc43..57f2cab37a950feee7236743104c9990db8153b7 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 b5f85151ff7c7f57d9909aa6afd9a528007340f1..e0c5ce4a26659790592e7398a8a2dfc2a1d6dc7e 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 93348236086e1be3fc8f00a9245825effaf7fc43..57f2cab37a950feee7236743104c9990db8153b7 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 f38018f3c3647f44ca4dc2fb7a4614c7b2e09df2..b13eb035cb069d273aa1e50d5eeb8e5db9a8c41d 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 dc9c03d427d19703339a7ba973b5acfdc2260aef..e334e09b2ed66c980b08a7e7b46559dc890f4724 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 c0da4c826bdde7310ece6abbb1eac06c9a2f766b..f7dc2bcd54ac365f51ea6f2547c74d12897929a9 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 7ad335092afb966c6609a2676364265bb3dcc548..6d44e66267f174cc7c854036a97b38f768a3fff7 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 dc9c03d427d19703339a7ba973b5acfdc2260aef..e334e09b2ed66c980b08a7e7b46559dc890f4724 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 358428310ffc14038b2593723f9ea79f021a62b7..7d9bf06be9ccffec5084f1cac135f5c8ed27666f 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 dc9c03d427d19703339a7ba973b5acfdc2260aef..e334e09b2ed66c980b08a7e7b46559dc890f4724 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 1bb660bc22a2bc3af366b1bca6b485dd8d3f8b63..5faca4cfdbcfc516fa1f0d933bdba55e85c95f47 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 bfa24111bedc279e9e55fe1cd959d9b478f03587..ef2e13d8c901a07e47a51a8422f1ae10cbac2118 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 a4899484d55f6fa0bdbef61edac189bcf09d6902..009cca6319d2b46bcc42a9ef76f55a5eabaaca0c 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 fa448ca9f42cc2b9c5551a107892c1ff87b04304..e1a5be287eaa425e4e354c40c9d6de9376a0537f 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 af27fce273ec3d8b7e8ab050c2614731a6fa074b..58d365002635355430706892de883239c4dcbe62 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 74beffcb475823b82581036ab6ca529e057d6af9..76be60c6b810b76f9d31ba72b3d8c3d76c5ed63c 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 15ae5a8d942d93e1f4b92365b05f61c3a20eb5ec..d54a469f5388f35698256f27be50205d9a1b60c3 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 174d59e422879e4f3087a057eb3158776906e203..b757d9db7ec54a6e2ae394898c9f155045bacf1f 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 74c3f338dd4fe4c0e63bdbdc668eb3c3b0e7ceeb..cb295a9ea04a8a8d0a50c2b9bc177278a3267b9f 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 53ec856b89a67f107762453ac5be30fcb6c31c89..9a014fefa79f0f04c0f379bc2f19f50991cb2ea0 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 2101b8fd5f83dcb7aadaea5873835ca4d121655b..bbefec045ce979013b3a3d4ebf39abd1afa318e7 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 7394815d15dd58954f7bb81e5489aabece1e3107..89cfeca622aa9b6464c8479bc4cda6269298ca83 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 454aa7eeb4ffb1687271eeb14ecee3dd9da17297..f928e42b57f1bfd770c57d96af66efd2dbc81d62 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 780a7f57b5480edf47440ad47d5f13a82a3ae626..3530881f50b5d32dc86b8aa971caa5705efc7f70 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));
-
- 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]);
+ #ifdef DEBUG_DXC_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_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 01856768215a0eaff76e0ad0679c99aab50013fd..4de056de7a3dc8d2a334e2889e3a953ab05164a8 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 ec2d3fe26b8aad6327db74e152a38cf7a3a3bea8..8a8a9b0076d2d78f18204cb1526685da7983e9a5 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 8d2bda76cea50e80f9f162593db2dd3f12e35a71..0647c180cc53ea0cfd56b83ae18149a851471d71 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 547f306bbbd6ff57031ec7d60058b05336c6d7e3..384068d7b4a46f050b96f999bf6a63bff0ade86e 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 84747743cefed5541ee9623f62d24b8e712d902a..e94a9264a0022ca4e4c3951c7f05c1bbe05de3d1 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 c359710ab315d7991664691704bc9aa8385d0e73..bb3e341cb12c14b3fd6c96e3fce4f0305dd392db 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 57ad09dc0d094de6d844e20c11e8b83eb728f26d..d7fffae0728ef5d5316571838e85588feed7e50b 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 d3851f89a44a4c407e14fa35dc29fa4041dc6ea5..b8232780417a283d625124b292d8cbc8974f9550 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.