From a07ac6312f29b3f500c49c32b50374d57e0a3986 Mon Sep 17 00:00:00 2001 From: TheSFReader Date: Thu, 25 Oct 2018 17:35:16 +0200 Subject: [PATCH] G0 feedrate may be fixed or variable (#12172) --- Marlin/Configuration_adv.h | 8 ++- Marlin/src/config/default/Configuration_adv.h | 8 ++- .../AlephObjects/TAZ4/Configuration_adv.h | 8 ++- .../examples/Anet/A2/Configuration_adv.h | 8 ++- .../examples/Anet/A2plus/Configuration_adv.h | 8 ++- .../examples/Anet/A6/Configuration_adv.h | 8 ++- .../examples/Anet/A8/Configuration_adv.h | 8 ++- .../config/examples/ArmEd/Configuration_adv.h | 8 ++- .../BIBO/TouchX/cyclops/Configuration_adv.h | 8 ++- .../BIBO/TouchX/default/Configuration_adv.h | 8 ++- .../examples/BQ/Hephestos/Configuration_adv.h | 8 ++- .../BQ/Hephestos_2/Configuration_adv.h | 9 +-- .../examples/BQ/WITBOX/Configuration_adv.h | 8 ++- .../examples/Cartesio/Configuration_adv.h | 8 ++- .../Creality/CR-10/Configuration_adv.h | 8 ++- .../Creality/CR-10S/Configuration_adv.h | 8 ++- .../Creality/CR-10mini/Configuration_adv.h | 8 ++- .../Creality/CR-8/Configuration_adv.h | 8 ++- .../Creality/Ender-2/Configuration_adv.h | 8 ++- .../Creality/Ender-3/Configuration_adv.h | 8 ++- .../Creality/Ender-4/Configuration_adv.h | 8 ++- .../examples/Einstart-S/Configuration_adv.h | 8 ++- .../config/examples/Felix/Configuration_adv.h | 8 ++- .../FolgerTech/i3-2020/Configuration_adv.h | 8 ++- .../Formbot/Raptor/Configuration_adv.h | 8 ++- .../Formbot/T_Rex_2+/Configuration_adv.h | 8 ++- .../Formbot/T_Rex_3/Configuration_adv.h | 8 ++- .../Prusa i3 Pro C/Configuration_adv.h | 8 ++- .../Prusa i3 Pro W/Configuration_adv.h | 8 ++- .../Infitary/i3-M508/Configuration_adv.h | 8 ++- .../examples/JGAurora/A5/Configuration_adv.h | 8 ++- .../examples/MakerParts/Configuration_adv.h | 8 ++- .../examples/Malyan/M150/Configuration_adv.h | 8 ++- .../examples/Malyan/M200/Configuration_adv.h | 8 ++- .../Micromake/C1/enhanced/Configuration_adv.h | 8 ++- .../examples/Mks/Sbase/Configuration_adv.h | 8 ++- .../examples/RigidBot/Configuration_adv.h | 8 ++- .../config/examples/SCARA/Configuration_adv.h | 8 ++- .../examples/Sanguinololu/Configuration_adv.h | 8 ++- .../examples/TheBorg/Configuration_adv.h | 8 ++- .../examples/TinyBoy2/Configuration_adv.h | 8 ++- .../examples/Tronxy/X3A/Configuration_adv.h | 8 ++- .../UltiMachine/Archim2/Configuration_adv.h | 8 ++- .../Velleman/K8200/Configuration_adv.h | 8 ++- .../Velleman/K8400/Configuration_adv.h | 8 ++- .../Wanhao/Duplicator 6/Configuration_adv.h | 8 ++- .../delta/Anycubic/Kossel/Configuration_adv.h | 8 ++- .../FLSUN/auto_calibrate/Configuration_adv.h | 8 ++- .../delta/FLSUN/kossel/Configuration_adv.h | 8 ++- .../FLSUN/kossel_mini/Configuration_adv.h | 8 ++- .../delta/generic/Configuration_adv.h | 8 ++- .../delta/kossel_mini/Configuration_adv.h | 8 ++- .../delta/kossel_xl/Configuration_adv.h | 8 ++- .../gCreate/gMax1.5+/Configuration_adv.h | 8 ++- .../examples/makibox/Configuration_adv.h | 8 ++- .../tvrrug/Round2/Configuration_adv.h | 8 ++- .../config/examples/wt150/Configuration_adv.h | 8 ++- Marlin/src/gcode/gcode.cpp | 2 +- Marlin/src/gcode/gcode.h | 2 +- Marlin/src/gcode/motion/G0_G1.cpp | 55 ++++++++++--------- Marlin/src/inc/SanityCheck.h | 2 + 61 files changed, 319 insertions(+), 199 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 799972f53d..c00664fd70 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1614,9 +1614,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h index 799972f53d..c00664fd70 100755 --- a/Marlin/src/config/default/Configuration_adv.h +++ b/Marlin/src/config/default/Configuration_adv.h @@ -1614,9 +1614,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h index 97e0caccd8..16d978fe75 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h index 0808ed2fbb..66fb5224f7 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h index 0808ed2fbb..66fb5224f7 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h index 29065dc8e5..4f1e6d7aad 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h index 5f78f5ff56..94ff78f43a 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/ArmEd/Configuration_adv.h b/Marlin/src/config/examples/ArmEd/Configuration_adv.h index 75bdf7f072..9d7b64da93 100644 --- a/Marlin/src/config/examples/ArmEd/Configuration_adv.h +++ b/Marlin/src/config/examples/ArmEd/Configuration_adv.h @@ -1619,9 +1619,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h index ff7083185f..e071d7602a 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h index 867f2eac49..9396f02862 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h index ae671b2db4..a9b688349f 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h index d74569a966..2eff71803f 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -1621,11 +1621,12 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) -#endif +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode +#endif /** * User-defined menu items that execute custom GCode */ diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h index ae671b2db4..a9b688349f 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h index 81e9a9d5af..e4462f9e69 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h +++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h index 9c3d064e40..8806ba42f9 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h @@ -1616,9 +1616,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h index c07ada114d..e520fd2bc7 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h index 763fda2da7..7e21a1cad2 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h index da5d24deee..1275860c61 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h index 462675a55b..c4e8a8a640 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h index d759d405ec..e7263e20c7 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h index d858169e3d..892dfc12be 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h index 002e5b2e0a..de5df472b8 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h index e934805b8a..0b79fa22e7 100644 --- a/Marlin/src/config/examples/Felix/Configuration_adv.h +++ b/Marlin/src/config/examples/Felix/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h index 3de7d61262..8e1cf0480f 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h index 5c8b723ea8..9e1ba48635 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h @@ -1615,9 +1615,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h index 663fd064a8..308dba5234 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h @@ -1617,9 +1617,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h index 35476da91c..16ccd5b968 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h @@ -1618,9 +1618,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h index 81330b62d8..e4ed0e8f50 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h index 81330b62d8..e4ed0e8f50 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h index 504c360e64..87eaa429c6 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h index 1a3836bb34..e247335ffc 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h index 3ccddfceac..49666a4747 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h +++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h index 1e2bb02032..aee13cd71f 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h index 4b11a671c0..deb3d81adc 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h index f2aab2763a..1692a8e0bd 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h index bc098e550f..a681c8f89f 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h @@ -1621,9 +1621,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h index f4ae7d1ab1..c29d53adb1 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h +++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h index 163f8a315c..cce2bf7fa4 100644 --- a/Marlin/src/config/examples/SCARA/Configuration_adv.h +++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h index 53cbde691c..ad2e9e2202 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h index 4d764451b2..d5e5ce0440 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h +++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h index 80def61ffc..f59d4f1086 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h index 825c1c4223..0c36598ec7 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h index 558e54bd82..41001c52b8 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h index 8e10015517..8000f7bc88 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h @@ -1626,9 +1626,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h index a98a311be1..f80e04eb75 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index 55aea01c86..cae60f376c 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -1615,9 +1615,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h index 53359069d8..f5e103c2c3 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h @@ -1615,9 +1615,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index f3915deecc..7895bdcb0d 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -1615,9 +1615,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h index f3915deecc..7895bdcb0d 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -1615,9 +1615,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index d820c66376..ee9143bd3c 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -1615,9 +1615,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h index d820c66376..ee9143bd3c 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h @@ -1615,9 +1615,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h index d820c66376..ee9143bd3c 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h @@ -1615,9 +1615,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h index 12b35e871b..94a5c1021c 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h @@ -1615,9 +1615,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h index f4b2d675ed..0bde53827e 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h index 87e2126f70..3b29728ffe 100644 --- a/Marlin/src/config/examples/makibox/Configuration_adv.h +++ b/Marlin/src/config/examples/makibox/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h index f50e45736c..cc78a5b5c4 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h @@ -1613,9 +1613,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h index 7eb8e301d7..0ac35f4202 100644 --- a/Marlin/src/config/examples/wt150/Configuration_adv.h +++ b/Marlin/src/config/examples/wt150/Configuration_adv.h @@ -1614,9 +1614,11 @@ */ //#define PAREN_COMMENTS // Support for parentheses-delimited comments //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. -//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves. -#if ENABLED(G0_FEEDRATE) - #define DEFAULT_G0_FEEDRATE 3000 // (mm/m) + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif /** diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index 905a65f114..d2426bc46f 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -184,7 +184,7 @@ void GcodeSuite::process_parsed_command( case 'G': switch (parser.codenum) { case 0: case 1: G0_G1( // G0: Fast Move, G1: Linear Move - #if IS_SCARA || ENABLED(G0_FEEDRATE) + #if IS_SCARA || defined(G0_FEEDRATE) parser.codenum == 0 #endif ); diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h index 345b4a4dad..e6975fc821 100644 --- a/Marlin/src/gcode/gcode.h +++ b/Marlin/src/gcode/gcode.h @@ -342,7 +342,7 @@ public: private: static void G0_G1( - #if IS_SCARA || ENABLED(G0_FEEDRATE) + #if IS_SCARA || defined(G0_FEEDRATE) bool fast_move=false #endif ); diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp index fa0904d1b0..32e9e6f6a5 100644 --- a/Marlin/src/gcode/motion/G0_G1.cpp +++ b/Marlin/src/gcode/motion/G0_G1.cpp @@ -37,40 +37,48 @@ extern float destination[XYZE]; -#if ENABLED(G0_FEEDRATE) - float saved_g0_feedrate_mm_s = MMM_TO_MMS(DEFAULT_G0_FEEDRATE); -#endif - -#if ENABLED(NO_MOTION_BEFORE_HOMING) - #define G0_G1_CONDITION !axis_unhomed_error(parser.seen('X'), parser.seen('Y'), parser.seen('Z')) -#else - #define G0_G1_CONDITION true +#if ENABLED(VARIABLE_G0_FEEDRATE) + float saved_g0_feedrate_mm_s = MMM_TO_MMS(G0_FEEDRATE); #endif /** * G0, G1: Coordinated movement of X Y Z E axes */ void GcodeSuite::G0_G1( - #if IS_SCARA || ENABLED(G0_FEEDRATE) + #if IS_SCARA || defined(G0_FEEDRATE) bool fast_move/*=false*/ #endif ) { - #if ENABLED(G0_FEEDRATE) - float saved_g1_feedrate_mm_s; - #endif - if (IsRunning() && G0_G1_CONDITION) { + if (IsRunning() + #if ENABLED(NO_MOTION_BEFORE_HOMING) + && !axis_unhomed_error(parser.seen('X'), parser.seen('Y'), parser.seen('Z')) + #endif + ) { + + #ifdef G0_FEEDRATE + float saved_feedrate_mm_s; + #if ENABLED(VARIABLE_G0_FEEDRATE) + if (fast_move) { + saved_feedrate_mm_s = feedrate_mm_s; // Back up the (old) motion mode feedrate + feedrate_mm_s = saved_g0_feedrate_mm_s; // Get G0 feedrate from last usage + } + #endif + #endif - #if ENABLED(G0_FEEDRATE) + get_destination_from_command(); // For X Y Z E F + + #ifdef G0_FEEDRATE if (fast_move) { - // Save standard feedrate before setting feedrate to fast/g0 - saved_g1_feedrate_mm_s = feedrate_mm_s; - feedrate_mm_s = saved_g0_feedrate_mm_s; + #if ENABLED(VARIABLE_G0_FEEDRATE) + saved_g0_feedrate_mm_s = feedrate_mm_s; // Save feedrate for the next G0 + #else + saved_feedrate_mm_s = feedrate_mm_s; // Back up the (new) motion mode feedrate + feedrate_mm_s = MMM_TO_MMS(G0_FEEDRATE); // Get the fixed G0 feedrate + #endif } #endif - get_destination_from_command(); // For X Y Z E F - #if ENABLED(FWRETRACT) && ENABLED(FWRETRACT_AUTORETRACT) if (MIN_AUTORETRACT <= MAX_AUTORETRACT) { @@ -94,12 +102,9 @@ void GcodeSuite::G0_G1( prepare_move_to_destination(); #endif - #if ENABLED(G0_FEEDRATE) - // save G0 feedrate, and restore standard feedrate as soon as possible - if (fast_move) { - saved_g0_feedrate_mm_s = feedrate_mm_s; - feedrate_mm_s = saved_g1_feedrate_mm_s; - } + #ifdef G0_FEEDRATE + // Restore the motion mode feedrate + if (fast_move) feedrate_mm_s = saved_feedrate_mm_s; #endif #if ENABLED(NANODLP_Z_SYNC) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 2cba66abc0..4d5cbaaad6 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -319,6 +319,8 @@ #error "PARKING_EXTRUDER_SECURITY_RAISE is now TOOLCHANGE_ZRAISE. Please update your configuration." #elif defined(SWITCHING_TOOLHEAD_SECURITY_RAISE) #error "SWITCHING_TOOLHEAD_SECURITY_RAISE is now TOOLCHANGE_ZRAISE. Please update your configuration." +#elif defined(G0_FEEDRATE) && G0_FEEDRATE == 0 + #error "G0_FEEDRATE is now used to set the G0 feedrate. Please update your configuration." #endif #define BOARD_MKS_13 -47