From ee253991d4eeecacd022833ca72eff1c344b54ba Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Mon, 8 Oct 2018 16:39:55 -0400 Subject: [PATCH] Various fixups for single-nozzle filament swap (#12036) --- Marlin/Configuration.h | 9 ++++---- Marlin/src/config/default/Configuration.h | 9 ++++---- .../AlephObjects/TAZ4/Configuration.h | 9 ++++---- .../AliExpress/CL-260/Configuration.h | 9 ++++---- .../config/examples/Anet/A2/Configuration.h | 9 ++++---- .../examples/Anet/A2plus/Configuration.h | 9 ++++---- .../config/examples/Anet/A6/Configuration.h | 9 ++++---- .../config/examples/Anet/A8/Configuration.h | 9 ++++---- .../examples/Azteeg/X5GT/Configuration.h | 9 ++++---- .../BIBO/TouchX/cyclops/Configuration.h | 9 ++++---- .../BIBO/TouchX/default/Configuration.h | 9 ++++---- .../examples/BQ/Hephestos/Configuration.h | 9 ++++---- .../examples/BQ/Hephestos_2/Configuration.h | 9 ++++---- .../config/examples/BQ/WITBOX/Configuration.h | 9 ++++---- .../config/examples/Cartesio/Configuration.h | 9 ++++---- .../examples/Creality/CR-10/Configuration.h | 9 ++++---- .../examples/Creality/CR-10S/Configuration.h | 9 ++++---- .../Creality/CR-10mini/Configuration.h | 9 ++++---- .../examples/Creality/CR-8/Configuration.h | 9 ++++---- .../examples/Creality/Ender-2/Configuration.h | 9 ++++---- .../examples/Creality/Ender-3/Configuration.h | 9 ++++---- .../examples/Creality/Ender-4/Configuration.h | 9 ++++---- .../examples/Einstart-S/Configuration.h | 9 ++++---- .../src/config/examples/Felix/Configuration.h | 9 ++++---- .../examples/Felix/DUAL/Configuration.h | 9 ++++---- .../FolgerTech/i3-2020/Configuration.h | 9 ++++---- .../examples/Formbot/Raptor/Configuration.h | 9 ++++---- .../examples/Formbot/T_Rex_2+/Configuration.h | 9 ++++---- .../examples/Formbot/T_Rex_3/Configuration.h | 9 ++++---- .../examples/Geeetech/GT2560/Configuration.h | 9 ++++---- .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 9 ++++---- .../Geeetech/MeCreator2/Configuration.h | 9 ++++---- .../Prusa i3 Pro B/bltouch/Configuration.h | 9 ++++---- .../Prusa i3 Pro B/noprobe/Configuration.h | 9 ++++---- .../Geeetech/Prusa i3 Pro C/Configuration.h | 9 ++++---- .../Geeetech/Prusa i3 Pro W/Configuration.h | 9 ++++---- .../examples/Infitary/i3-M508/Configuration.h | 9 ++++---- .../examples/JGAurora/A5/Configuration.h | 9 ++++---- .../examples/MakerParts/Configuration.h | 9 ++++---- .../examples/Malyan/M150/Configuration.h | 9 ++++---- .../examples/Malyan/M200/Configuration.h | 9 ++++---- .../Micromake/C1/basic/Configuration.h | 9 ++++---- .../Micromake/C1/enhanced/Configuration.h | 9 ++++---- .../config/examples/Mks/Sbase/Configuration.h | 9 ++++---- .../examples/RepRapPro/Huxley/Configuration.h | 9 ++++---- .../RepRapWorld/Megatronics/Configuration.h | 9 ++++---- .../config/examples/RigidBot/Configuration.h | 9 ++++---- .../src/config/examples/SCARA/Configuration.h | 9 ++++---- .../config/examples/STM32F10/Configuration.h | 9 ++++---- .../config/examples/STM32F4/Configuration.h | 9 ++++---- .../examples/Sanguinololu/Configuration.h | 9 ++++---- .../config/examples/TheBorg/Configuration.h | 9 ++++---- .../config/examples/TinyBoy2/Configuration.h | 9 ++++---- .../config/examples/Tronxy/X1/Configuration.h | 9 ++++---- .../examples/Tronxy/X3A/Configuration.h | 9 ++++---- .../examples/Tronxy/X5S/Configuration.h | 9 ++++---- .../examples/Tronxy/XY100/Configuration.h | 9 ++++---- .../UltiMachine/Archim2/Configuration.h | 9 ++++---- .../examples/Velleman/K8200/Configuration.h | 9 ++++---- .../examples/Velleman/K8400/Configuration.h | 9 ++++---- .../Velleman/K8400/Dual-head/Configuration.h | 9 ++++---- .../Wanhao/Duplicator 6/Configuration.h | 9 ++++---- .../examples/adafruit/ST7565/Configuration.h | 9 ++++---- .../delta/Anycubic/Kossel/Configuration.h | 9 ++++---- .../FLSUN/auto_calibrate/Configuration.h | 9 ++++---- .../delta/FLSUN/kossel/Configuration.h | 9 ++++---- .../delta/FLSUN/kossel_mini/Configuration.h | 9 ++++---- .../delta/Hatchbox_Alpha/Configuration.h | 9 ++++---- .../examples/delta/generic/Configuration.h | 9 ++++---- .../delta/kossel_mini/Configuration.h | 9 ++++---- .../examples/delta/kossel_pro/Configuration.h | 9 ++++---- .../examples/delta/kossel_xl/Configuration.h | 9 ++++---- .../examples/gCreate/gMax1.5+/Configuration.h | 9 ++++---- .../config/examples/makibox/Configuration.h | 9 ++++---- .../examples/stm32f103ret6/Configuration.h | 9 ++++---- .../examples/tvrrug/Round2/Configuration.h | 9 ++++---- .../src/config/examples/wt150/Configuration.h | 9 ++++---- Marlin/src/gcode/config/M217.cpp | 4 ++-- Marlin/src/inc/Conditionals_post.h | 22 ------------------- Marlin/src/inc/SanityCheck.h | 21 ++++++++++++++++-- Marlin/src/module/tool_change.cpp | 22 +++++++++---------- 81 files changed, 417 insertions(+), 345 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 4028c70c0..d551fe443 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h index 4028c70c0..d551fe443 100644 --- a/Marlin/src/config/default/Configuration.h +++ b/Marlin/src/config/default/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h index c167a48ae..622b242e9 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h index 85d54f540..47b4f55c9 100644 --- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h +++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Anet/A2/Configuration.h b/Marlin/src/config/examples/Anet/A2/Configuration.h index 01ae5a7ba..dddd775ef 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration.h b/Marlin/src/config/examples/Anet/A2plus/Configuration.h index 16c867f97..d3a6790a8 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h index 78180eb2c..2783b7348 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h index f7fcc05e5..0d44449f4 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration.h @@ -157,13 +157,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h index 1429222f9..db9fa983d 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h index 88b0693c3..334ae2386 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. #define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h index 8e704dc85..3664f1377 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h index fcfe674fb..a78388200 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h index 699195476..0fd576f6b 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h @@ -164,13 +164,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h index 8ff04094e..b5f9beca7 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h index d76591b9a..31d9c362a 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration.h +++ b/Marlin/src/config/examples/Cartesio/Configuration.h @@ -157,13 +157,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h index 1e9296f18..4d4962fd0 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h index 3eca6a2e6..4949b576d 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h @@ -160,13 +160,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h index a5d70bd14..568908085 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h @@ -165,13 +165,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration.h b/Marlin/src/config/examples/Creality/CR-8/Configuration.h index 1a3903312..187de1365 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h index 7114be4aa..bd69cf9a6 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h index e9c300431..38857b4b9 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h index afc7a482f..d4490d40b 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Einstart-S/Configuration.h b/Marlin/src/config/examples/Einstart-S/Configuration.h index 3e3131f33..f66fcd33c 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h index 8f7074ea2..6019be1c5 100644 --- a/Marlin/src/config/examples/Felix/Configuration.h +++ b/Marlin/src/config/examples/Felix/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h index 9dbf7b933..d95adb674 100644 --- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h +++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h index 4d69f86a0..c42d7ec73 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration.h index 667d751b2..6a354717d 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration.h @@ -197,13 +197,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #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 023542d46..f95bca033 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h @@ -159,13 +159,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #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 a7490236a..8f64ac35e 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h @@ -160,13 +160,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h index 2ed7e0956..e5f96dbf9 100644 --- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #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 eabc7d214..b20ea69f4 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 @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h index 598bc7b4c..cdb240df3 100644 --- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #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 197f3874a..9f336788f 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 @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #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 e397aa173..c70cc4dc4 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 @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #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 c543fb069..639987f3f 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 @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #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 87f51423a..f83e10711 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 @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h index 1d9c8c896..da0b3c043 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h index e01f8b391..83def4a57 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h @@ -161,13 +161,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h index 47843b7d3..10d7b38fe 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration.h +++ b/Marlin/src/config/examples/MakerParts/Configuration.h @@ -176,13 +176,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h index 812b022c4..dc07a6d6a 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h @@ -161,13 +161,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h index 0dd1615d3..5601bf961 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h index 7adeb4dcf..19ca33993 100644 --- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h index a06c1fb87..2af187883 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h index 89d7b2464..6f8782882 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h index 55f452d49..d6f5dc03b 100644 --- a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h +++ b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h index da7f1f205..4734c37fb 100644 --- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h index ce9ebb6ce..c3cc3c35b 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration.h +++ b/Marlin/src/config/examples/RigidBot/Configuration.h @@ -159,13 +159,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h index e50a7bdd4..78a473bd3 100644 --- a/Marlin/src/config/examples/SCARA/Configuration.h +++ b/Marlin/src/config/examples/SCARA/Configuration.h @@ -187,13 +187,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h index d442de78b..76adb08dc 100644 --- a/Marlin/src/config/examples/STM32F10/Configuration.h +++ b/Marlin/src/config/examples/STM32F10/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/STM32F4/Configuration.h b/Marlin/src/config/examples/STM32F4/Configuration.h index 9b18f33bd..4b9bc49eb 100644 --- a/Marlin/src/config/examples/STM32F4/Configuration.h +++ b/Marlin/src/config/examples/STM32F4/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h index a6be78e95..46e733d18 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h index 371d37423..df9afdb95 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration.h +++ b/Marlin/src/config/examples/TheBorg/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h index 0cd5706c1..e41e58f1f 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h @@ -178,13 +178,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h index a68f13dde..c1f46b862 100644 --- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h index 8edec5528..581912cf2 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h index c47557263..65d179af6 100644 --- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h index af65ff263..df113c63c 100644 --- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h index 06a498819..779f8f425 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h index 66b72697c..5caf98d0f 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h @@ -176,13 +176,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h index 8a14f3aa2..d080f6e44 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #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 9c7a1ecb7..076554db6 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h index c7f228712..40be77397 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h index 22aa1cc0e..3af7debf8 100644 --- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h +++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h index 901e92e90..15654ca07 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h @@ -169,13 +169,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #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 c9b2dd4ec..0d59ad964 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h index 20f60f690..6de5f8b49 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #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 467277358..911e8f166 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h index bfcf8752d..fd3e9c4bd 100644 --- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h +++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h @@ -161,13 +161,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h index 55bbb258e..2122badd0 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration.h +++ b/Marlin/src/config/examples/delta/generic/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h index 61d50c935..5d1490a9c 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h index 43a0760ab..c87ebfc4a 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h @@ -160,13 +160,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h index 0619d062b..595928a90 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h index f8675be71..3988563bd 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h @@ -161,13 +161,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h index 4e6c1eedb..55de98dbf 100644 --- a/Marlin/src/config/examples/makibox/Configuration.h +++ b/Marlin/src/config/examples/makibox/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h index 3f3894d10..beca84f9c 100644 --- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h +++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h index 240c15112..03cb2d0e2 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h index 621eb9bcc..9972e9d14 100644 --- a/Marlin/src/config/examples/wt150/Configuration.h +++ b/Marlin/src/config/examples/wt150/Configuration.h @@ -156,13 +156,14 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE #if ENABLED(SINGLENOZZLE) - // Length of filament to retract and prime on toolchange - //#define SINGLENOZZLE_SWAP_LENGTH 12.0 - //#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) - //#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) + // Parameters for filament retract / prime on toolchange + #define SINGLENOZZLE_SWAP_LENGTH 12 // (mm) + #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m) //#define SINGLENOZZLE_SWAP_PARK #if ENABLED(SINGLENOZZLE_SWAP_PARK) #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } + #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m) #else #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 #endif diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp index 630c826d4..2b3d8d2cc 100644 --- a/Marlin/src/gcode/config/M217.cpp +++ b/Marlin/src/gcode/config/M217.cpp @@ -45,8 +45,8 @@ void M217_report(const bool eeprom=false) { * M217 - Set SINGLENOZZLE toolchange parameters * * S[mm] Swap length - * P[mm/s] Prime speed - * R[mm/s] Retract speed + * P[mm/m] Prime speed + * R[mm/m] Retract speed */ void GcodeSuite::M217() { diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 518952985..326a701af 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -1513,28 +1513,6 @@ // Add commands that need sub-codes to this list #define USE_GCODE_SUBCODES ENABLED(G38_PROBE_TARGET) || ENABLED(CNC_COORDINATE_SYSTEMS) || ENABLED(POWER_LOSS_RECOVERY) -// Single Nozzle swap on toolchange defaults -#if ENABLED(SINGLENOZZLE) - #ifndef SINGLENOZZLE_SWAP_LENGTH - #define SINGLENOZZLE_SWAP_LENGTH 0 - #endif - #ifndef SINGLENOZZLE_SWAP_RETRACT_SPEED - #define SINGLENOZZLE_SWAP_RETRACT_SPEED 60.0 - #endif - #ifndef SINGLENOZZLE_SWAP_PRIME_SPEED - #define SINGLENOZZLE_SWAP_PRIME_SPEED 60.0 - #endif - #if ENABLED(SINGLENOZZLE_SWAP_PARK) - #ifndef SINGLENOZZLE_TOOLCHANGE_POSITION - #define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 } - #endif - #else - #ifndef SINGLENOZZLE_TOOLCHANGE_ZRAISE - #define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0 - #endif - #endif -#endif - // Parking Extruder #if ENABLED(PARKING_EXTRUDER) #ifndef PARKING_EXTRUDER_GRAB_DISTANCE diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 6c75b028d..4e6e1a650 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -602,8 +602,25 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE, #error "EXTRUDERS must be 1 with HEATERS_PARALLEL." #endif - #if ENABLED(SINGLENOZZLE) && !defined(SINGLENOZZLE_SWAP_LENGTH) - #define SINGLENOZZLE_SWAP_LENGTH 0 + #if ENABLED(SINGLENOZZLE) + #ifndef SINGLENOZZLE_SWAP_LENGTH + #error "SINGLENOZZLE requires SINGLENOZZLE_SWAP_LENGTH. Please update your Configuration." + #elif !defined(SINGLENOZZLE_SWAP_RETRACT_SPEED) + #error "SINGLENOZZLE requires SINGLENOZZLE_SWAP_RETRACT_SPEED. Please update your Configuration." + #elif !defined(SINGLENOZZLE_SWAP_PRIME_SPEED) + #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." + #elif !defined(SINGLENOZZLE_PARK_XY_FEEDRATE) + #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." + #endif + #endif #endif #elif ENABLED(MK2_MULTIPLEXER) diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index 36a89e951..9b0c11dcf 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -663,6 +663,15 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n set_destination_from_current(); + if (singlenozzle_swap_length) { + #if ENABLED(ADVANCED_PAUSE_FEATURE) + do_pause_e_move(-singlenozzle_swap_length, MMM_TO_MMS(singlenozzle_retract_speed)); + #else + current_position[E_AXIS] -= singlenozzle_swap_length / planner.e_factor[active_extruder]; + planner.buffer_line(current_position, MMM_TO_MMS(singlenozzle_retract_speed), active_extruder); + #endif + } + current_position[Z_AXIS] += ( #if ENABLED(SINGLENOZZLE_SWAP_PARK) singlenozzle_change_point.z @@ -676,18 +685,9 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n #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, planner.max_feedrate_mm_s[Y_AXIS], active_extruder); + planner.buffer_line(current_position, MMM_TO_MMS(SINGLENOZZLE_PARK_XY_FEEDRATE), active_extruder); #endif - if (singlenozzle_swap_length) { - #if ENABLED(ADVANCED_PAUSE_FEATURE) - do_pause_e_move(-singlenozzle_swap_length, MMM_TO_MMS(singlenozzle_retract_speed)); - #else - current_position[E_AXIS] -= singlenozzle_swap_length / planner.e_factor[active_extruder]; - planner.buffer_line(current_position, MMM_TO_MMS(singlenozzle_retract_speed), active_extruder); - #endif - } - singlenozzle_temp[active_extruder] = thermalManager.target_temperature[0]; if (singlenozzle_temp[tmp_extruder] && singlenozzle_temp[tmp_extruder] != singlenozzle_temp[active_extruder]) { thermalManager.setTargetHotend(singlenozzle_temp[tmp_extruder], 0); @@ -711,7 +711,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n #if ENABLED(SINGLENOZZLE_SWAP_PARK) current_position[X_AXIS] = destination[X_AXIS]; current_position[Y_AXIS] = destination[Y_AXIS]; - planner.buffer_line(current_position, planner.max_feedrate_mm_s[Y_AXIS], active_extruder); + 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]);