From 84b59d58fb71366e4ef1f3cde79873bff53ea2d6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 16 Oct 2018 02:02:20 -0500 Subject: [PATCH] Clean up whitespace --- Marlin/Configuration_adv.h | 2 +- Marlin/src/config/default/Configuration_adv.h | 2 +- .../config/examples/AlephObjects/TAZ4/Configuration_adv.h | 2 +- Marlin/src/config/examples/Anet/A2/Configuration_adv.h | 2 +- .../src/config/examples/Anet/A2plus/Configuration_adv.h | 2 +- Marlin/src/config/examples/Anet/A6/Configuration_adv.h | 2 +- Marlin/src/config/examples/Anet/A8/Configuration_adv.h | 2 +- .../examples/BIBO/TouchX/cyclops/Configuration_adv.h | 2 +- .../examples/BIBO/TouchX/default/Configuration_adv.h | 2 +- .../src/config/examples/BQ/Hephestos/Configuration_adv.h | 2 +- .../config/examples/BQ/Hephestos_2/Configuration_adv.h | 2 +- Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h | 2 +- Marlin/src/config/examples/Cartesio/Configuration_adv.h | 2 +- .../config/examples/Creality/CR-10/Configuration_adv.h | 2 +- .../config/examples/Creality/CR-10S/Configuration_adv.h | 2 +- .../examples/Creality/CR-10mini/Configuration_adv.h | 2 +- .../src/config/examples/Creality/CR-8/Configuration_adv.h | 2 +- .../config/examples/Creality/Ender-2/Configuration_adv.h | 2 +- .../config/examples/Creality/Ender-3/Configuration_adv.h | 2 +- .../config/examples/Creality/Ender-4/Configuration_adv.h | 2 +- Marlin/src/config/examples/Einstart-S/Configuration_adv.h | 2 +- Marlin/src/config/examples/Felix/Configuration_adv.h | 2 +- .../examples/FolgerTech/i3-2020/Configuration_adv.h | 2 +- .../config/examples/Formbot/Raptor/Configuration_adv.h | 2 +- .../config/examples/Formbot/T_Rex_2+/Configuration_adv.h | 2 +- .../config/examples/Formbot/T_Rex_3/Configuration_adv.h | 2 +- .../examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h | 2 +- .../examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h | 2 +- .../config/examples/Infitary/i3-M508/Configuration_adv.h | 2 +- .../src/config/examples/JGAurora/A5/Configuration_adv.h | 2 +- Marlin/src/config/examples/MakerParts/Configuration_adv.h | 2 +- .../src/config/examples/Malyan/M150/Configuration_adv.h | 2 +- .../src/config/examples/Malyan/M200/Configuration_adv.h | 2 +- .../examples/Micromake/C1/enhanced/Configuration_adv.h | 2 +- Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h | 2 +- Marlin/src/config/examples/RigidBot/Configuration_adv.h | 2 +- Marlin/src/config/examples/SCARA/Configuration_adv.h | 2 +- .../src/config/examples/Sanguinololu/Configuration_adv.h | 2 +- Marlin/src/config/examples/TheBorg/Configuration_adv.h | 2 +- Marlin/src/config/examples/TinyBoy2/Configuration_adv.h | 2 +- Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h | 2 +- .../examples/UltiMachine/Archim2/Configuration_adv.h | 2 +- .../config/examples/Velleman/K8200/Configuration_adv.h | 2 +- .../config/examples/Velleman/K8400/Configuration_adv.h | 2 +- .../examples/Wanhao/Duplicator 6/Configuration_adv.h | 2 +- .../config/examples/delta/Anycubic/Kossel/Configuration.h | 8 +++++--- .../examples/delta/Anycubic/Kossel/Configuration_adv.h | 2 +- .../delta/FLSUN/auto_calibrate/Configuration_adv.h | 2 +- .../examples/delta/FLSUN/kossel/Configuration_adv.h | 2 +- .../examples/delta/FLSUN/kossel_mini/Configuration_adv.h | 2 +- .../src/config/examples/delta/generic/Configuration_adv.h | 2 +- .../config/examples/delta/kossel_mini/Configuration_adv.h | 2 +- .../config/examples/delta/kossel_xl/Configuration_adv.h | 2 +- .../config/examples/gCreate/gMax1.5+/Configuration_adv.h | 2 +- Marlin/src/config/examples/makibox/Configuration_adv.h | 2 +- .../src/config/examples/tvrrug/Round2/Configuration_adv.h | 2 +- Marlin/src/config/examples/wt150/Configuration_adv.h | 2 +- Marlin/src/gcode/motion/G0_G1.cpp | 8 ++++---- 58 files changed, 65 insertions(+), 63 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 0721b4134b..83d45b001d 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1621,7 +1621,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h index 0721b4134b..83d45b001d 100755 --- a/Marlin/src/config/default/Configuration_adv.h +++ b/Marlin/src/config/default/Configuration_adv.h @@ -1621,7 +1621,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h index 704793a586..afbc0d2803 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h index ac219c4690..81037e2d77 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h index ac219c4690..81037e2d77 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h index a25231976a..b611f1a1bc 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h index 89505e8cfc..2b27265e8b 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 b05d646230..2471d9cae0 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 e42efcfbfd..bc3ca561ae 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h index 364c311394..34749d2d1e 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 ce77ab2327..2749d951dc 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -1628,7 +1628,7 @@ //#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 +#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 364c311394..34749d2d1e 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h index 9fa92f2bab..c0ffd3bf71 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h +++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 e1881e038d..66b4e622b4 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h @@ -1623,7 +1623,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 da7f48ae91..28b2ed2bf3 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 15f4456b5c..7c6a6fa661 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 4ed64a910d..194d914983 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 f04d9bcb2a..bf94bb4cb8 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 58db3d4b5a..e35e8c3c7b 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 ddc36892ea..72e94d0006 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h index f3349be617..3e1f97aac8 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h index 51d34961de..839b50d853 100644 --- a/Marlin/src/config/examples/Felix/Configuration_adv.h +++ b/Marlin/src/config/examples/Felix/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 26401fee1c..41e939d57e 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h index 36ae0174ca..d735e22f33 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h @@ -1622,7 +1622,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 0c62cbe1f1..76b2e5f222 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 @@ -1624,7 +1624,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 74443c484c..0d2094d3f7 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 @@ -1625,7 +1625,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 d5e2a810ad..eb6752cf9f 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 @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 d5e2a810ad..eb6752cf9f 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 @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 6c90d06d53..229e92da67 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h index f5758ef16e..fa9266d777 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h index 778969447d..d35ef2932e 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h +++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h index abcc4bf15b..ceee680a86 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h index ecb01a1b18..03c39ed3a6 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 98f1609002..3acc11dc13 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h index eebd9d5072..c32f278c03 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h @@ -1628,7 +1628,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h index 743c74f864..e839fda145 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h +++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h index 60f676db6a..ca1c521580 100644 --- a/Marlin/src/config/examples/SCARA/Configuration_adv.h +++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h index 07bf9761c2..fd4ee516f7 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h index ef82d3fbe9..967bd0c591 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h +++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h index ad07176bb3..bc86e1a39a 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h index 62d395d3a9..42694dbcd8 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h index b31429b925..177dbb8e55 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h index 9c477bddbf..835e6917bf 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h @@ -1633,7 +1633,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h index 65edb1620f..36c4dc41c3 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 ace05fd149..94c053cac4 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -1622,7 +1622,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h index 7a97cfaaca..ddeda85edf 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h @@ -25,8 +25,10 @@ */ // normal size or plus? //#define ANYCUBIC_KOSSEL_PLUS + // Anycubic Probe version 1 or 2 see README.md; 0 for no probe #define ANYCUBIC_PROBE_VERSION 0 + // Heated Bed: // 0 ... no heated bed // 1 ... aluminium heated bed with "BuildTak-like" sticker @@ -992,11 +994,11 @@ #define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle] #if ANYCUBIC_PROBE_VERSION == 2 - #define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8 // Z offset: -below +above [the nozzle] + #define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8 // Z offset: -below +above [the nozzle] #elif ANYCUBIC_PROBE_VERSION == 1 - #define Z_PROBE_OFFSET_FROM_EXTRUDER -19.0 // Z offset: -below +above [the nozzle] + #define Z_PROBE_OFFSET_FROM_EXTRUDER -19.0 // Z offset: -below +above [the nozzle] #else - #define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle] + #define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle] #endif // Certain types of probes need to stay away from edges 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 bddd9e849d..a89f48324b 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h @@ -1622,7 +1622,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 1d20e272e1..b450e26744 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 @@ -1622,7 +1622,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 1d20e272e1..b450e26744 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -1622,7 +1622,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 ca64018f42..96c6059752 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 @@ -1622,7 +1622,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h index ca64018f42..96c6059752 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h @@ -1622,7 +1622,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 ca64018f42..96c6059752 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h @@ -1622,7 +1622,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 0a2411c019..8bd41a9c8f 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h @@ -1622,7 +1622,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode 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 79028c592c..322062cc87 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h index fba5e6438d..eafec13353 100644 --- a/Marlin/src/config/examples/makibox/Configuration_adv.h +++ b/Marlin/src/config/examples/makibox/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h index 742fbc9a27..506e52a90c 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h @@ -1620,7 +1620,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h index f76fc27a87..f568e77734 100644 --- a/Marlin/src/config/examples/wt150/Configuration_adv.h +++ b/Marlin/src/config/examples/wt150/Configuration_adv.h @@ -1621,7 +1621,7 @@ //#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 +#endif /** * User-defined menu items that execute custom GCode diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp index be2927b335..fa0904d1b0 100644 --- a/Marlin/src/gcode/motion/G0_G1.cpp +++ b/Marlin/src/gcode/motion/G0_G1.cpp @@ -58,9 +58,9 @@ void GcodeSuite::G0_G1( #if ENABLED(G0_FEEDRATE) float saved_g1_feedrate_mm_s; #endif - + if (IsRunning() && G0_G1_CONDITION) { - + #if ENABLED(G0_FEEDRATE) if (fast_move) { // Save standard feedrate before setting feedrate to fast/g0 @@ -95,13 +95,13 @@ void GcodeSuite::G0_G1( #endif #if ENABLED(G0_FEEDRATE) - // save G0 feedrate, and restore standard feedrate as soon as possible + // 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; } #endif - + #if ENABLED(NANODLP_Z_SYNC) #if ENABLED(NANODLP_ALL_AXIS) #define _MOVE_SYNC parser.seenval('X') || parser.seenval('Y') || parser.seenval('Z') // For any move wait and output sync message