From 951b25163e8b9e09212594b47c26434f23dc1a1e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 13 Oct 2018 23:08:20 -0500 Subject: [PATCH] Extend M217 with configurable park/raise (#12076) --- Marlin/Configuration.h | 5 +-- Marlin/src/config/default/Configuration.h | 5 +-- .../AlephObjects/TAZ4/Configuration.h | 5 +-- .../AliExpress/CL-260/Configuration.h | 5 +-- .../config/examples/Anet/A2/Configuration.h | 5 +-- .../examples/Anet/A2plus/Configuration.h | 5 +-- .../config/examples/Anet/A6/Configuration.h | 5 +-- .../config/examples/Anet/A8/Configuration.h | 5 +-- .../examples/Azteeg/X5GT/Configuration.h | 5 +-- .../BIBO/TouchX/cyclops/Configuration.h | 5 +-- .../BIBO/TouchX/default/Configuration.h | 5 +-- .../examples/BQ/Hephestos/Configuration.h | 5 +-- .../examples/BQ/Hephestos_2/Configuration.h | 5 +-- .../config/examples/BQ/WITBOX/Configuration.h | 5 +-- .../config/examples/Cartesio/Configuration.h | 5 +-- .../examples/Creality/CR-10/Configuration.h | 5 +-- .../examples/Creality/CR-10S/Configuration.h | 5 +-- .../Creality/CR-10mini/Configuration.h | 5 +-- .../examples/Creality/CR-8/Configuration.h | 5 +-- .../examples/Creality/Ender-2/Configuration.h | 5 +-- .../examples/Creality/Ender-3/Configuration.h | 5 +-- .../examples/Creality/Ender-4/Configuration.h | 5 +-- .../examples/Einstart-S/Configuration.h | 5 +-- .../src/config/examples/Felix/Configuration.h | 5 +-- .../examples/Felix/DUAL/Configuration.h | 5 +-- .../FolgerTech/i3-2020/Configuration.h | 5 +-- .../examples/Formbot/Raptor/Configuration.h | 5 +-- .../examples/Formbot/T_Rex_2+/Configuration.h | 5 +-- .../examples/Formbot/T_Rex_3/Configuration.h | 5 +-- .../examples/Geeetech/GT2560/Configuration.h | 5 +-- .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 5 +-- .../Geeetech/MeCreator2/Configuration.h | 5 +-- .../Prusa i3 Pro B/bltouch/Configuration.h | 5 +-- .../Prusa i3 Pro B/noprobe/Configuration.h | 5 +-- .../Geeetech/Prusa i3 Pro C/Configuration.h | 5 +-- .../Geeetech/Prusa i3 Pro W/Configuration.h | 5 +-- .../examples/Infitary/i3-M508/Configuration.h | 5 +-- .../examples/JGAurora/A5/Configuration.h | 5 +-- .../examples/MakerParts/Configuration.h | 5 +-- .../examples/Malyan/M150/Configuration.h | 5 +-- .../examples/Malyan/M200/Configuration.h | 5 +-- .../Micromake/C1/basic/Configuration.h | 5 +-- .../Micromake/C1/enhanced/Configuration.h | 5 +-- .../config/examples/Mks/Sbase/Configuration.h | 5 +-- .../examples/RepRapPro/Huxley/Configuration.h | 5 +-- .../RepRapWorld/Megatronics/Configuration.h | 5 +-- .../config/examples/RigidBot/Configuration.h | 5 +-- .../src/config/examples/SCARA/Configuration.h | 5 +-- .../config/examples/STM32F10/Configuration.h | 5 +-- .../config/examples/STM32F4/Configuration.h | 5 +-- .../examples/Sanguinololu/Configuration.h | 5 +-- .../config/examples/TheBorg/Configuration.h | 5 +-- .../config/examples/TinyBoy2/Configuration.h | 5 +-- .../config/examples/Tronxy/X1/Configuration.h | 5 +-- .../examples/Tronxy/X3A/Configuration.h | 5 +-- .../examples/Tronxy/X5S/Configuration.h | 5 +-- .../examples/Tronxy/XY100/Configuration.h | 5 +-- .../UltiMachine/Archim2/Configuration.h | 5 +-- .../examples/Velleman/K8200/Configuration.h | 5 +-- .../examples/Velleman/K8400/Configuration.h | 5 +-- .../Velleman/K8400/Dual-head/Configuration.h | 5 +-- .../Wanhao/Duplicator 6/Configuration.h | 5 +-- .../examples/adafruit/ST7565/Configuration.h | 5 +-- .../delta/Anycubic/Kossel/Configuration.h | 5 +-- .../FLSUN/auto_calibrate/Configuration.h | 5 +-- .../delta/FLSUN/kossel/Configuration.h | 5 +-- .../delta/FLSUN/kossel_mini/Configuration.h | 5 +-- .../delta/Hatchbox_Alpha/Configuration.h | 5 +-- .../examples/delta/generic/Configuration.h | 5 +-- .../delta/kossel_mini/Configuration.h | 5 +-- .../examples/delta/kossel_pro/Configuration.h | 5 +-- .../examples/delta/kossel_xl/Configuration.h | 5 +-- .../examples/gCreate/gMax1.5+/Configuration.h | 5 +-- .../config/examples/makibox/Configuration.h | 5 +-- .../examples/stm32f103ret6/Configuration.h | 5 +-- .../examples/tvrrug/Round2/Configuration.h | 5 +-- .../src/config/examples/wt150/Configuration.h | 5 +-- Marlin/src/gcode/config/M217.cpp | 34 ++++++++++---- Marlin/src/gcode/config/M92.cpp | 4 +- Marlin/src/gcode/parser.h | 29 +++++++++--- Marlin/src/inc/SanityCheck.h | 4 +- Marlin/src/libs/point_t.h | 6 +-- Marlin/src/module/configuration_store.cpp | 10 ++--- Marlin/src/module/motion.h | 8 ++++ Marlin/src/module/probe.cpp | 4 -- Marlin/src/module/tool_change.cpp | 44 +++++++------------ Marlin/src/module/tool_change.h | 4 ++ 87 files changed, 241 insertions(+), 291 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index f2199290b..f4e989b2d 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h index f2199290b..f4e989b2d 100644 --- a/Marlin/src/config/default/Configuration.h +++ b/Marlin/src/config/default/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h index 0506445a6..ee7fbc4dd 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h index e8ac07531..b4a49a348 100644 --- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h +++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Anet/A2/Configuration.h b/Marlin/src/config/examples/Anet/A2/Configuration.h index 7f7d61b81..1977b27a3 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration.h b/Marlin/src/config/examples/Anet/A2plus/Configuration.h index 2598a8725..1a37daff2 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h index c3630adad..eb75e70bb 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h index 9e20f0411..d01e51e7a 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration.h @@ -162,11 +162,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h index dfacc715b..8eb76a500 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h index e2b29f053..6a2942ce6 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h index 113a0d67a..7a5401c4e 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h index 09a818108..4b823656f 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h index d3a66826a..48969fc4a 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h @@ -169,11 +169,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h index 8b0843eb5..46b7d86d3 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h index f98723d34..abeb29606 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration.h +++ b/Marlin/src/config/examples/Cartesio/Configuration.h @@ -162,11 +162,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h index c1601ed08..4f695d52b 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h index dd691a73f..40c12a4de 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h @@ -165,11 +165,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h index 50a7a0d8d..ecb3afd0a 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h @@ -170,11 +170,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration.h b/Marlin/src/config/examples/Creality/CR-8/Configuration.h index aeeca5fff..8af530568 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h index dd869dfdb..a34fd9517 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h index 2f143b9d7..0b93a4d8a 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h index fd5e7f807..e893b16cc 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Einstart-S/Configuration.h b/Marlin/src/config/examples/Einstart-S/Configuration.h index 9b848291c..322194a83 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h index 398aca614..6be1a79d4 100644 --- a/Marlin/src/config/examples/Felix/Configuration.h +++ b/Marlin/src/config/examples/Felix/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h index 9303315cb..2812b4296 100644 --- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h +++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h index 99adf678a..78ad6d5fd 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration.h index 1aa28329b..e2d4bec71 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration.h @@ -202,11 +202,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif 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 41afd7966..462d606f1 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h @@ -164,11 +164,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif 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 35f1495de..0b02fe9ad 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h @@ -165,11 +165,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h index ce67571d9..a9f48f15b 100644 --- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif 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 0787ccab7..40c6f8c74 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,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h index bfc8c3b13..ea0d0dbfc 100644 --- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif 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 189544a12..7a9318174 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,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif 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 c450c6d5f..d6b66544c 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,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif 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 6607a18fd..10fae0bd3 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,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif 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 a1e77439b..9be0b33fd 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,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h index c957e03a4..52469b4ac 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h index dd64fc3d2..2ecae5161 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h @@ -166,11 +166,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h index 78c1075d6..8ca0b1eb0 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration.h +++ b/Marlin/src/config/examples/MakerParts/Configuration.h @@ -181,11 +181,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h index 859670fea..40e5c6322 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h @@ -166,11 +166,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h index 8ececcb8d..701f4c618 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h index fbd91ef72..d5339693b 100644 --- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h index ebc944a1b..3ae5a7670 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h index 747467bc9..a862786d5 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h index 1b46a0f81..b9feed52a 100644 --- a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h +++ b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h index 44128373f..d83f97338 100644 --- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h index e0d3eab03..e7fa3ecf3 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration.h +++ b/Marlin/src/config/examples/RigidBot/Configuration.h @@ -164,11 +164,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h index 1e1f47b7f..acc277c1c 100644 --- a/Marlin/src/config/examples/SCARA/Configuration.h +++ b/Marlin/src/config/examples/SCARA/Configuration.h @@ -192,11 +192,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h index 1a271619d..43ba32f6d 100644 --- a/Marlin/src/config/examples/STM32F10/Configuration.h +++ b/Marlin/src/config/examples/STM32F10/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/STM32F4/Configuration.h b/Marlin/src/config/examples/STM32F4/Configuration.h index f3307fb69..ca57f2563 100644 --- a/Marlin/src/config/examples/STM32F4/Configuration.h +++ b/Marlin/src/config/examples/STM32F4/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h index 14897bcb1..e256fb524 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h index faebe5c8a..1fa6fe8a3 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration.h +++ b/Marlin/src/config/examples/TheBorg/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h index cbc6158a0..7a60dee6a 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h @@ -183,11 +183,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h index b370c59b9..e4520e4f6 100644 --- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h index b3cafdcbc..a53fcf7f2 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h index e9d37877a..1a665ff84 100644 --- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h index ca0c06b88..aed251c1c 100644 --- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h index 16379f73c..242f5ebf7 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h index 559b7cec7..f13b73150 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h @@ -181,11 +181,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h index df3613999..f3765aaeb 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif 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 5817af46c..e2c1534e8 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h index f709eb641..592897d2f 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h index 914fb4af3..57a5f71b4 100644 --- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h +++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h index 73f170353..7a97cfaac 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h @@ -174,11 +174,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif 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 65cdc6a80..b35c19265 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h index d737dc2f0..523414824 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif 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 434343d1d..3d69cd021 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h index e0f35e41b..bb60fafb5 100644 --- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h +++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h @@ -166,11 +166,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h index b7f6283a9..eac171f1e 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration.h +++ b/Marlin/src/config/examples/delta/generic/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h index b804ba3e6..0405b0952 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h index d8ce98419..cf697634e 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h @@ -165,11 +165,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h index 3c1c4a83c..41ecae5b4 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h index acfe2dbc2..0caab0540 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h @@ -166,11 +166,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h index d2ec5b374..3215dc8da 100644 --- a/Marlin/src/config/examples/makibox/Configuration.h +++ b/Marlin/src/config/examples/makibox/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h index 30f5590cb..7530b3309 100644 --- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h +++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h index 796f84cd5..9ac2a1242 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h index e7ef7c43a..1972f02f7 100644 --- a/Marlin/src/config/examples/wt150/Configuration.h +++ b/Marlin/src/config/examples/wt150/Configuration.h @@ -161,11 +161,10 @@ #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_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) - #else - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif #endif diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp index e0abbc424..454aa7eeb 100644 --- a/Marlin/src/gcode/config/M217.cpp +++ b/Marlin/src/gcode/config/M217.cpp @@ -36,25 +36,41 @@ void M217_report(const bool eeprom=false) { 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", sn_settings.swap_length); - SERIAL_ECHOPAIR_P(port, " P", sn_settings.prime_speed); - SERIAL_ECHOLNPAIR_P(port, " R", sn_settings.retract_speed); + 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)); + #endif + SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(sn_settings.z_raise)); + SERIAL_EOL(); } /** * M217 - Set SINGLENOZZLE toolchange parameters * - * S[mm] Swap length - * P[mm/m] Prime speed - * R[mm/m] Retract speed + * S[linear] Swap length + * P[linear/m] Prime speed + * R[linear/m] Retract speed + * X[linear] Park X (Requires SINGLENOZZLE_SWAP_PARK) + * Y[linear] Park Y (Requires SINGLENOZZLE_SWAP_PARK) + * Z[linear] Z Raise */ void GcodeSuite::M217() { bool report = true; - if (parser.seenval('S')) { report = false; const float v = parser.value_float(); sn_settings.swap_length = constrain(v, 0, 500); } - if (parser.seenval('P')) { report = false; const int16_t v = parser.value_int(); sn_settings.prime_speed = constrain(v, 10, 5400); } - if (parser.seenval('R')) { report = false; const int16_t v = parser.value_int(); sn_settings.retract_speed = constrain(v, 10, 5400); } + 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_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 (report) M217_report(); diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp index e3423a2a6..e0dd1eb26 100644 --- a/Marlin/src/gcode/config/M92.cpp +++ b/Marlin/src/gcode/config/M92.cpp @@ -36,7 +36,7 @@ void GcodeSuite::M92() { LOOP_XYZE(i) { if (parser.seen(axis_codes[i])) { if (i == E_AXIS) { - const float value = parser.value_per_axis_unit((AxisEnum)(E_AXIS + TARGET_EXTRUDER)); + const float value = parser.value_per_axis_units((AxisEnum)(E_AXIS + TARGET_EXTRUDER)); if (value < 20) { float factor = planner.settings.axis_steps_per_mm[E_AXIS + TARGET_EXTRUDER] / value; // increase e constants if M92 E14 is given for netfab. #if HAS_CLASSIC_JERK && (DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)) @@ -48,7 +48,7 @@ void GcodeSuite::M92() { planner.settings.axis_steps_per_mm[E_AXIS + TARGET_EXTRUDER] = value; } else { - planner.settings.axis_steps_per_mm[i] = parser.value_per_axis_unit((AxisEnum)i); + planner.settings.axis_steps_per_mm[i] = parser.value_per_axis_units((AxisEnum)i); } } } diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h index d70c28620..6123bc90f 100644 --- a/Marlin/src/gcode/parser.h +++ b/Marlin/src/gcode/parser.h @@ -224,6 +224,9 @@ public: #if ENABLED(INCH_MODE_SUPPORT) + static inline float mm_to_linear_unit(const float mm) { return mm / linear_unit_factor; } + static inline float mm_to_volumetric_unit(const float mm) { return mm / (volumetric_enabled ? volumetric_unit_factor : linear_unit_factor); } + // Init linear units by constructor GCodeParser() { set_input_linear_units(LINEARUNIT_MM); } @@ -244,18 +247,28 @@ public: return (axis >= E_AXIS && volumetric_enabled ? volumetric_unit_factor : linear_unit_factor); } - static inline float value_linear_units() { return value_float() * linear_unit_factor; } - static inline float value_axis_units(const AxisEnum axis) { return value_float() * axis_unit_factor(axis); } - static inline float value_per_axis_unit(const AxisEnum axis) { return value_float() / axis_unit_factor(axis); } + FORCE_INLINE static float linear_value_to_mm(const float v) { return v * linear_unit_factor; } + FORCE_INLINE static float axis_value_to_mm(const AxisEnum axis, const float v) { return v * axis_unit_factor(axis); } + FORCE_INLINE static float per_axis_value(const AxisEnum axis, const float v) { return v / axis_unit_factor(axis); } #else - FORCE_INLINE static float value_linear_units() { return value_float(); } - FORCE_INLINE static float value_axis_units(const AxisEnum a) { UNUSED(a); return value_float(); } - FORCE_INLINE static float value_per_axis_unit(const AxisEnum a) { UNUSED(a); return value_float(); } + FORCE_INLINE static float mm_to_linear_unit(const float mm) { return mm; } + FORCE_INLINE static float mm_to_volumetric_unit(const float mm) { return mm; } + + FORCE_INLINE static float linear_value_to_mm(const float v) { return v; } + FORCE_INLINE static float axis_value_to_mm(const AxisEnum axis, const float v) { UNUSED(axis); return v; } + FORCE_INLINE static float per_axis_value(const AxisEnum axis, const float v) { UNUSED(axis); return v; } #endif + #define LINEAR_UNIT(V) parser.mm_to_linear_unit(V) + #define VOLUMETRIC_UNIT(V) parser.mm_to_volumetric_unit(V) + + static inline float value_linear_units() { return linear_value_to_mm(value_float()); } + static inline float value_axis_units(const AxisEnum axis) { return axis_value_to_mm(axis, value_float()); } + static inline float value_per_axis_units(const AxisEnum axis) { return per_axis_value(axis, value_float()); } + #if ENABLED(TEMPERATURE_UNITS_SUPPORT) static inline void set_input_temp_units(TempUnit units) { input_temp_units = units; } @@ -306,11 +319,15 @@ public: } } + #define TEMP_UNIT(N) parser.to_temp_units(N) + #else // !TEMPERATURE_UNITS_SUPPORT FORCE_INLINE static float value_celsius() { return value_float(); } FORCE_INLINE static float value_celsius_diff() { return value_float(); } + #define TEMP_UNIT(N) (N) + #endif // !TEMPERATURE_UNITS_SUPPORT FORCE_INLINE static float value_feedrate() { return value_linear_units(); } diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index ff0159c0d..0f16ab6a9 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -611,8 +611,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE, #error "SINGLENOZZLE requires SINGLENOZZLE_SWAP_PRIME_SPEED. Please update your Configuration." #endif #if ENABLED(SINGLENOZZLE_SWAP_PARK) - #ifndef SINGLENOZZLE_TOOLCHANGE_POSITION - #error "SINGLENOZZLE_SWAP_PARK requires SINGLENOZZLE_TOOLCHANGE_POSITION. Please update your Configuration." + #ifndef SINGLENOZZLE_TOOLCHANGE_XY + #error "SINGLENOZZLE_SWAP_PARK requires SINGLENOZZLE_TOOLCHANGE_XY. Please update your Configuration." #elif !defined(SINGLENOZZLE_PARK_XY_FEEDRATE) #error "SINGLENOZZLE_SWAP_PARK requires SINGLENOZZLE_PARK_XY_FEEDRATE. Please update your Configuration." #endif diff --git a/Marlin/src/libs/point_t.h b/Marlin/src/libs/point_t.h index 37ade7eba..7a065cb33 100644 --- a/Marlin/src/libs/point_t.h +++ b/Marlin/src/libs/point_t.h @@ -19,9 +19,9 @@ * along with this program. If not, see . * */ +#pragma once -#ifndef __POINT_T__ -#define __POINT_T__ +#include /** * @brief Cartesian Point @@ -53,5 +53,3 @@ struct point_t { point_t(const float x, const float y) : point_t(x, y, NAN) {} }; - -#endif // __POINT_T__ diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index 150f56280..bb45cc0f1 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -1836,6 +1836,10 @@ void MarlinSettings::reset(PORTARG_SOLO) { 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; + #if ENABLED(SINGLENOZZLE_SWAP_PARK) + sn_settings.change_point = SINGLENOZZLE_TOOLCHANGE_XY; + #endif #endif // @@ -2096,15 +2100,11 @@ void MarlinSettings::reset(PORTARG_SOLO) { */ CONFIG_ECHO_START; #if ENABLED(INCH_MODE_SUPPORT) - #define LINEAR_UNIT(N) (float(N) / parser.linear_unit_factor) - #define VOLUMETRIC_UNIT(N) (float(N) / (parser.volumetric_enabled ? parser.volumetric_unit_factor : parser.linear_unit_factor)) SERIAL_ECHOPGM_P(port, " G2"); SERIAL_CHAR_P(port, parser.linear_unit_factor == 1.0 ? '1' : '0'); SERIAL_ECHOPGM_P(port, " ;"); SAY_UNITS_P(port, false); #else - #define LINEAR_UNIT(N) (N) - #define VOLUMETRIC_UNIT(N) (N) SERIAL_ECHOPGM_P(port, " G21 ; Units in mm"); SAY_UNITS_P(port, false); #endif @@ -2116,13 +2116,11 @@ void MarlinSettings::reset(PORTARG_SOLO) { CONFIG_ECHO_START; #if ENABLED(TEMPERATURE_UNITS_SUPPORT) - #define TEMP_UNIT(N) parser.to_temp_units(N) SERIAL_ECHOPGM_P(port, " M149 "); SERIAL_CHAR_P(port, parser.temp_units_code()); SERIAL_ECHOPGM_P(port, " ; Units in "); serialprintPGM_P(port, parser.temp_units_name()); #else - #define TEMP_UNIT(N) (N) SERIAL_ECHOLNPGM_P(port, " M149 C ; Units in Celsius"); #endif diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h index 1b4f727c8..8d8b38d15 100644 --- a/Marlin/src/module/motion.h +++ b/Marlin/src/module/motion.h @@ -155,6 +155,14 @@ void do_blocking_move_to_x(const float &rx, const float &fr_mm_s=0); void do_blocking_move_to_z(const float &rz, const float &fr_mm_s=0); void do_blocking_move_to_xy(const float &rx, const float &ry, const float &fr_mm_s=0); +FORCE_INLINE void do_blocking_move_to(const float (&raw)[XYZ], const float &fr_mm_s) { + do_blocking_move_to(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], fr_mm_s); +} + +FORCE_INLINE void do_blocking_move_to(const float (&raw)[XYZE], const float &fr_mm_s) { + do_blocking_move_to(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], fr_mm_s); +} + void setup_for_endstop_or_probe_move(); void clean_up_after_endstop_or_probe_move(); diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index b19433b10..68d97733f 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -94,10 +94,6 @@ float zprobe_zoffset; // Initialized by settings.load() #elif ENABLED(Z_PROBE_ALLEN_KEY) - FORCE_INLINE void do_blocking_move_to(const float (&raw)[XYZ], const float &fr_mm_s) { - do_blocking_move_to(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], fr_mm_s); - } - void run_deploy_moves_script() { #if defined(Z_PROBE_ALLEN_KEY_DEPLOY_1_X) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_1_Y) || defined(Z_PROBE_ALLEN_KEY_DEPLOY_1_Z) #ifndef Z_PROBE_ALLEN_KEY_DEPLOY_1_X diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index 0d4b0b0fd..6d1695870 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -35,10 +35,6 @@ #if FAN_COUNT > 0 uint8_t singlenozzle_fan_speed[EXTRUDERS]; #endif - #if ENABLED(SINGLENOZZLE_SWAP_PARK) - #include "../libs/point_t.h" - const point_t singlenozzle_change_point = SINGLENOZZLE_TOOLCHANGE_POSITION; - #endif #endif #if ENABLED(PARKING_EXTRUDER) && PARKING_EXTRUDER_SOLENOIDS_DELAY > 0 @@ -659,8 +655,6 @@ 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 (!no_move) set_destination_from_current(); - if (sn_settings.swap_length) { #if ENABLED(ADVANCED_PAUSE_FEATURE) do_pause_e_move(-sn_settings.swap_length, MMM_TO_MMS(sn_settings.retract_speed)); @@ -670,22 +664,26 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n #endif } - if (!no_move) { - current_position[Z_AXIS] += ( - #if ENABLED(SINGLENOZZLE_SWAP_PARK) - singlenozzle_change_point.z - #else - SINGLENOZZLE_TOOLCHANGE_ZRAISE - #endif - ); + constexpr float snfr = + #if ENABLED(SINGLENOZZLE_SWAP_PARK) + MMM_TO_MMS(SINGLENOZZLE_PARK_XY_FEEDRATE); + #else + 0 + #endif + ; - planner.buffer_line(current_position, planner.settings.max_feedrate_mm_s[Z_AXIS], active_extruder); + float old_pos[XYZ]; + + if (!no_move) { + COPY(old_pos, current_position); #if ENABLED(SINGLENOZZLE_SWAP_PARK) - current_position[X_AXIS] = singlenozzle_change_point.x; - current_position[Y_AXIS] = singlenozzle_change_point.y; - planner.buffer_line(current_position, MMM_TO_MMS(SINGLENOZZLE_PARK_XY_FEEDRATE), active_extruder); + current_position[X_AXIS] = sn_settings.change_point.x; + current_position[Y_AXIS] = sn_settings.change_point.y; #endif + current_position[Z_AXIS] += sn_settings.z_raise; + + do_blocking_move_to(current_position, snfr); } singlenozzle_temp[active_extruder] = thermalManager.target_temperature[0]; @@ -708,15 +706,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n #endif } - if (!no_move) { - #if ENABLED(SINGLENOZZLE_SWAP_PARK) - current_position[X_AXIS] = destination[X_AXIS]; - current_position[Y_AXIS] = destination[Y_AXIS]; - planner.buffer_line(current_position, MMM_TO_MMS(SINGLENOZZLE_PARK_XY_FEEDRATE), active_extruder); - #endif - - do_blocking_move_to(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS]); - } + if (!no_move) do_blocking_move_to(old_pos, snfr); #elif EXTRUDERS > 1 diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h index 39b8b0b68..d3851f89a 100644 --- a/Marlin/src/module/tool_change.h +++ b/Marlin/src/module/tool_change.h @@ -52,6 +52,10 @@ 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];