From cfc5e96b4b316683391c7acae5b298a59fc7cba2 Mon Sep 17 00:00:00 2001
From: Ludy <Ludy87@users.noreply.github.com>
Date: Thu, 27 Dec 2018 22:29:39 +0100
Subject: [PATCH] Move JD to Config.h (and fix jerk->eeprom bug) (#12720)
---
Marlin/Configuration.h | 19 ++++++++---
Marlin/Configuration_adv.h | 8 -----
Marlin/src/config/default/Configuration.h | 19 ++++++++---
Marlin/src/config/default/Configuration_adv.h | 8 -----
.../AlephObjects/TAZ4/Configuration.h | 19 ++++++++---
.../AlephObjects/TAZ4/Configuration_adv.h | 8 -----
.../AliExpress/CL-260/Configuration.h | 19 ++++++++---
.../config/examples/Anet/A2/Configuration.h | 19 ++++++++---
.../examples/Anet/A2/Configuration_adv.h | 8 -----
.../examples/Anet/A2plus/Configuration.h | 19 ++++++++---
.../examples/Anet/A2plus/Configuration_adv.h | 8 -----
.../config/examples/Anet/A6/Configuration.h | 18 ++++++++---
.../examples/Anet/A6/Configuration_adv.h | 8 -----
.../config/examples/Anet/A8/Configuration.h | 19 ++++++++---
.../examples/Anet/A8/Configuration_adv.h | 8 -----
.../src/config/examples/ArmEd/Configuration.h | 19 ++++++++---
.../config/examples/ArmEd/Configuration_adv.h | 8 -----
.../examples/Azteeg/X5GT/Configuration.h | 19 ++++++++---
.../BIBO/TouchX/cyclops/Configuration.h | 19 ++++++++---
.../BIBO/TouchX/cyclops/Configuration_adv.h | 8 -----
.../BIBO/TouchX/default/Configuration.h | 19 ++++++++---
.../BIBO/TouchX/default/Configuration_adv.h | 8 -----
.../examples/BQ/Hephestos/Configuration.h | 19 ++++++++---
.../examples/BQ/Hephestos/Configuration_adv.h | 8 -----
.../examples/BQ/Hephestos_2/Configuration.h | 19 ++++++++---
.../BQ/Hephestos_2/Configuration_adv.h | 8 -----
.../config/examples/BQ/WITBOX/Configuration.h | 19 ++++++++---
.../examples/BQ/WITBOX/Configuration_adv.h | 8 -----
.../config/examples/Cartesio/Configuration.h | 19 ++++++++---
.../examples/Cartesio/Configuration_adv.h | 8 -----
.../examples/Creality/CR-10/Configuration.h | 19 ++++++++---
.../Creality/CR-10/Configuration_adv.h | 8 -----
.../examples/Creality/CR-10S/Configuration.h | 19 ++++++++---
.../Creality/CR-10S/Configuration_adv.h | 8 -----
.../Creality/CR-10mini/Configuration.h | 19 ++++++++---
.../Creality/CR-10mini/Configuration_adv.h | 8 -----
.../examples/Creality/CR-8/Configuration.h | 19 ++++++++---
.../Creality/CR-8/Configuration_adv.h | 8 -----
.../examples/Creality/Ender-2/Configuration.h | 19 ++++++++---
.../Creality/Ender-2/Configuration_adv.h | 8 -----
.../examples/Creality/Ender-3/Configuration.h | 19 ++++++++---
.../Creality/Ender-3/Configuration_adv.h | 8 -----
.../examples/Creality/Ender-4/Configuration.h | 19 ++++++++---
.../Creality/Ender-4/Configuration_adv.h | 8 -----
.../examples/Einstart-S/Configuration.h | 19 ++++++++---
.../examples/Einstart-S/Configuration_adv.h | 8 -----
.../src/config/examples/Felix/Configuration.h | 19 ++++++++---
.../config/examples/Felix/Configuration_adv.h | 8 -----
.../examples/Felix/DUAL/Configuration.h | 19 ++++++++---
.../FolgerTech/i3-2020/Configuration.h | 19 ++++++++---
.../FolgerTech/i3-2020/Configuration_adv.h | 8 -----
.../examples/Formbot/Raptor/Configuration.h | 32 ++++++++++++-------
.../Formbot/Raptor/Configuration_adv.h | 8 -----
.../examples/Formbot/T_Rex_2+/Configuration.h | 19 ++++++++---
.../Formbot/T_Rex_2+/Configuration_adv.h | 8 -----
.../examples/Formbot/T_Rex_3/Configuration.h | 24 ++++++++------
.../Formbot/T_Rex_3/Configuration_adv.h | 8 -----
.../examples/Geeetech/GT2560/Configuration.h | 19 ++++++++---
.../Geeetech/I3_Pro_X-GT2560/Configuration.h | 19 ++++++++---
.../Geeetech/MeCreator2/Configuration.h | 19 ++++++++---
.../Geeetech/MeCreator2/Configuration_adv.h | 8 -----
.../Prusa i3 Pro B/bltouch/Configuration.h | 19 ++++++++---
.../Prusa i3 Pro B/noprobe/Configuration.h | 19 ++++++++---
.../Geeetech/Prusa i3 Pro C/Configuration.h | 19 ++++++++---
.../Prusa i3 Pro C/Configuration_adv.h | 8 -----
.../Geeetech/Prusa i3 Pro W/Configuration.h | 19 ++++++++---
.../Prusa i3 Pro W/Configuration_adv.h | 8 -----
.../examples/Infitary/i3-M508/Configuration.h | 19 ++++++++---
.../Infitary/i3-M508/Configuration_adv.h | 8 -----
.../examples/JGAurora/A5/Configuration.h | 19 ++++++++---
.../examples/JGAurora/A5/Configuration_adv.h | 8 -----
.../examples/MakerParts/Configuration.h | 19 ++++++++---
.../examples/MakerParts/Configuration_adv.h | 8 -----
.../examples/Malyan/M150/Configuration.h | 19 ++++++++---
.../examples/Malyan/M150/Configuration_adv.h | 8 -----
.../examples/Malyan/M200/Configuration.h | 19 ++++++++---
.../examples/Malyan/M200/Configuration_adv.h | 8 -----
.../Micromake/C1/basic/Configuration.h | 19 ++++++++---
.../Micromake/C1/enhanced/Configuration.h | 19 ++++++++---
.../Micromake/C1/enhanced/Configuration_adv.h | 8 -----
.../config/examples/Mks/Robin/Configuration.h | 19 ++++++++---
.../examples/Mks/Robin/Configuration_adv.h | 8 -----
.../config/examples/Mks/Sbase/Configuration.h | 19 ++++++++---
.../examples/Mks/Sbase/Configuration_adv.h | 8 -----
.../examples/RepRapPro/Huxley/Configuration.h | 19 ++++++++---
.../RepRapWorld/Megatronics/Configuration.h | 19 ++++++++---
.../config/examples/RigidBot/Configuration.h | 19 ++++++++---
.../examples/RigidBot/Configuration_adv.h | 8 -----
.../src/config/examples/SCARA/Configuration.h | 19 ++++++++---
.../config/examples/SCARA/Configuration_adv.h | 8 -----
.../config/examples/STM32F10/Configuration.h | 19 ++++++++---
.../config/examples/STM32F4/Configuration.h | 19 ++++++++---
.../examples/Sanguinololu/Configuration.h | 19 ++++++++---
.../examples/Sanguinololu/Configuration_adv.h | 8 -----
.../config/examples/TheBorg/Configuration.h | 19 ++++++++---
.../examples/TheBorg/Configuration_adv.h | 8 -----
.../config/examples/TinyBoy2/Configuration.h | 19 ++++++++---
.../examples/TinyBoy2/Configuration_adv.h | 8 -----
.../config/examples/Tronxy/X1/Configuration.h | 19 ++++++++---
.../examples/Tronxy/X3A/Configuration.h | 19 ++++++++---
.../examples/Tronxy/X3A/Configuration_adv.h | 8 -----
.../examples/Tronxy/X5S/Configuration.h | 19 ++++++++---
.../examples/Tronxy/XY100/Configuration.h | 19 ++++++++---
.../UltiMachine/Archim1/Configuration.h | 19 ++++++++---
.../UltiMachine/Archim1/Configuration_adv.h | 8 -----
.../UltiMachine/Archim2/Configuration.h | 19 ++++++++---
.../UltiMachine/Archim2/Configuration_adv.h | 8 -----
.../examples/Velleman/K8200/Configuration.h | 19 ++++++++---
.../Velleman/K8200/Configuration_adv.h | 8 -----
.../examples/Velleman/K8400/Configuration.h | 19 ++++++++---
.../Velleman/K8400/Configuration_adv.h | 8 -----
.../Velleman/K8400/Dual-head/Configuration.h | 19 ++++++++---
.../Wanhao/Duplicator 6/Configuration.h | 19 ++++++++---
.../Wanhao/Duplicator 6/Configuration_adv.h | 8 -----
.../examples/adafruit/ST7565/Configuration.h | 19 ++++++++---
.../delta/Anycubic/Kossel/Configuration.h | 19 ++++++++---
.../delta/Anycubic/Kossel/Configuration_adv.h | 8 -----
.../FLSUN/auto_calibrate/Configuration.h | 19 ++++++++---
.../FLSUN/auto_calibrate/Configuration_adv.h | 8 -----
.../delta/FLSUN/kossel/Configuration.h | 19 ++++++++---
.../delta/FLSUN/kossel/Configuration_adv.h | 8 -----
.../delta/FLSUN/kossel_mini/Configuration.h | 19 ++++++++---
.../FLSUN/kossel_mini/Configuration_adv.h | 8 -----
.../Geeetech/Rostock 301/Configuration.h | 19 ++++++++---
.../Geeetech/Rostock 301/Configuration_adv.h | 8 -----
.../delta/Hatchbox_Alpha/Configuration.h | 19 ++++++++---
.../examples/delta/MKS/SBASE/Configuration.h | 19 ++++++++---
.../delta/MKS/SBASE/Configuration_adv.h | 8 -----
.../delta/Tevo Little Monster/Configuration.h | 19 ++++++++---
.../Tevo Little Monster/Configuration_adv.h | 8 -----
.../examples/delta/generic/Configuration.h | 19 ++++++++---
.../delta/generic/Configuration_adv.h | 8 -----
.../delta/kossel_mini/Configuration.h | 19 ++++++++---
.../delta/kossel_mini/Configuration_adv.h | 8 -----
.../examples/delta/kossel_pro/Configuration.h | 19 ++++++++---
.../examples/delta/kossel_xl/Configuration.h | 19 ++++++++---
.../delta/kossel_xl/Configuration_adv.h | 8 -----
.../examples/gCreate/gMax1.5+/Configuration.h | 19 ++++++++---
.../gCreate/gMax1.5+/Configuration_adv.h | 8 -----
.../config/examples/makibox/Configuration.h | 19 ++++++++---
.../examples/makibox/Configuration_adv.h | 8 -----
.../examples/stm32f103ret6/Configuration.h | 19 ++++++++---
.../examples/tvrrug/Round2/Configuration.h | 19 ++++++++---
.../tvrrug/Round2/Configuration_adv.h | 8 -----
.../src/config/examples/wt150/Configuration.h | 19 ++++++++---
.../config/examples/wt150/Configuration_adv.h | 8 -----
Marlin/src/inc/SanityCheck.h | 2 +-
Marlin/src/module/configuration_store.cpp | 3 --
148 files changed, 1251 insertions(+), 852 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5918c9d49e..64bc3af491 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e0f419ad4a..069cf7c2f0 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h
index 5918c9d49e..64bc3af491 100644
--- a/Marlin/src/config/default/Configuration.h
+++ b/Marlin/src/config/default/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h
index 1d33ce7a07..d3a8b7e137 100755
--- a/Marlin/src/config/default/Configuration_adv.h
+++ b/Marlin/src/config/default/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
index 8be726a135..efc6114de4 100644
--- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
+++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
@@ -689,6 +689,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -697,10 +705,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 8.0
-#define DEFAULT_YJERK 8.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 10.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 8.0
+ #define DEFAULT_YJERK 8.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 10.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
index 6a645ce4d8..4b142a27d5 100644
--- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
+++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
index 9fd004d0f1..cd593c0ceb 100644
--- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
+++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Anet/A2/Configuration.h b/Marlin/src/config/examples/Anet/A2/Configuration.h
index 0cc52a2c54..21fd9eda51 100644
--- a/Marlin/src/config/examples/Anet/A2/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A2/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
index 5a59d354ec..ce47b0b8e1 100644
--- a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration.h b/Marlin/src/config/examples/Anet/A2plus/Configuration.h
index 7d50ba4af8..d62c63cd74 100644
--- a/Marlin/src/config/examples/Anet/A2plus/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A2plus/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
index 5a59d354ec..ce47b0b8e1 100644
--- a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h
index 8d1b8d3e79..c515d63739 100644
--- a/Marlin/src/config/examples/Anet/A6/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A6/Configuration.h
@@ -714,6 +714,13 @@
//#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
//#define DEFAULT_TRAVEL_ACCELERATION 4000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
/**
* Default Jerk (mm/s)
@@ -725,10 +732,13 @@
*/
// ANET A6 Firmware V2.0 defaults (jerk):
// Vxy-jerk: 10, Vz-jerk: +000.30, Ve-jerk: 5
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
index b5cc0134ab..90eaeb65b1 100644
--- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
@@ -481,14 +481,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h
index d1acc0b25c..54334e6fac 100644
--- a/Marlin/src/config/examples/Anet/A8/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A8/Configuration.h
@@ -682,6 +682,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -690,10 +698,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
index 740cda6a33..93cd2d04fa 100644
--- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/ArmEd/Configuration.h b/Marlin/src/config/examples/ArmEd/Configuration.h
index ed4d02a7f4..fd47c1c26c 100644
--- a/Marlin/src/config/examples/ArmEd/Configuration.h
+++ b/Marlin/src/config/examples/ArmEd/Configuration.h
@@ -681,6 +681,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -689,10 +697,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 8.0
-#define DEFAULT_YJERK 8.0
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 1.5
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 8.0
+ #define DEFAULT_YJERK 8.0
+ #define DEFAULT_ZJERK 0.4
+#endif
+
+#define DEFAULT_EJERK 1.5 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/ArmEd/Configuration_adv.h b/Marlin/src/config/examples/ArmEd/Configuration_adv.h
index 3415a94d3d..bf20b3c38e 100644
--- a/Marlin/src/config/examples/ArmEd/Configuration_adv.h
+++ b/Marlin/src/config/examples/ArmEd/Configuration_adv.h
@@ -465,14 +465,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
index 21ea362b5c..1fdecd8f07 100644
--- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
+++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
index d42c34ca4b..4bd815c406 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1100 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1100 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 7.0
-#define DEFAULT_YJERK 7.0
-#define DEFAULT_ZJERK 0.65
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 7.0
+ #define DEFAULT_YJERK 7.0
+ #define DEFAULT_ZJERK 0.65
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 3496e1ad58..477d4b56b3 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
@@ -481,14 +481,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
index 729b064f76..55c7c0b053 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1100 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1100 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 7.0
-#define DEFAULT_YJERK 7.0
-#define DEFAULT_ZJERK 0.65
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 7.0
+ #define DEFAULT_YJERK 7.0
+ #define DEFAULT_ZJERK 0.65
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 d7db914559..8d0f1d7bae 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
index f03ca8e0f2..043f1cb929 100644
--- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
+++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
@@ -657,6 +657,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -665,10 +673,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
index bf832e5a8e..8789e3ae31 100644
--- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
index 8f6adfded1..db2583122b 100644
--- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
+++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
@@ -670,6 +670,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1300 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -678,10 +686,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 5.0
-#define DEFAULT_YJERK 5.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 10.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 5.0
+ #define DEFAULT_YJERK 5.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 10.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 6be41ec3ad..59d7593324 100644
--- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
index 84b074cdb6..1c6a1c41a2 100644
--- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
+++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
@@ -657,6 +657,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -665,10 +673,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
index bf832e5a8e..8789e3ae31 100644
--- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h
index 07f3057653..0ad247cecd 100644
--- a/Marlin/src/config/examples/Cartesio/Configuration.h
+++ b/Marlin/src/config/examples/Cartesio/Configuration.h
@@ -668,6 +668,14 @@
#define DEFAULT_RETRACT_ACCELERATION 10000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -676,10 +684,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h
index efe803d18e..6ee38ac6e1 100644
--- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h
+++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h
index 74431e9d3e..f6e9d284cb 100755
--- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h
@@ -679,6 +679,14 @@
#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -687,10 +695,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 2.7
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 2.7
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 2376abdf61..5311c1b359 100755
--- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h
index d600a111c8..a2f73b2527 100644
--- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 800 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.4
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 7042b8638b..7dcc305a0c 100644
--- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
index e147598274..a5439ffb3c 100644
--- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
@@ -688,6 +688,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -696,10 +704,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 ef8ec2f8b0..238764c54a 100644
--- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration.h b/Marlin/src/config/examples/Creality/CR-8/Configuration.h
index 7d4b753ad4..2c5588dc3c 100644
--- a/Marlin/src/config/examples/Creality/CR-8/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-8/Configuration.h
@@ -679,6 +679,14 @@
#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -687,10 +695,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 20.0
-#define DEFAULT_YJERK 20.0
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.4
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 06731bbafe..6124d42a6e 100644
--- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h
index 9e5c4564cd..746b93b42d 100644
--- a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h
+++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h
@@ -673,6 +673,14 @@
#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -681,10 +689,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 d737ba538a..8bdd811e1c 100644
--- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h
index 519d9e9da9..6606686c28 100644
--- a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h
+++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h
@@ -673,6 +673,14 @@
#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -681,10 +689,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 56089712ce..47a4ff6ac8 100644
--- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h
index 911f54cb31..e81e648af9 100644
--- a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h
+++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h
@@ -679,6 +679,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -687,10 +695,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 20.0
-#define DEFAULT_YJERK 20.0
-#define DEFAULT_ZJERK 2.4
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 2.4
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 aff2c0a1d5..eb6b0d8321 100644
--- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Einstart-S/Configuration.h b/Marlin/src/config/examples/Einstart-S/Configuration.h
index 48c4c0f9c4..470d8dbdc4 100644
--- a/Marlin/src/config/examples/Einstart-S/Configuration.h
+++ b/Marlin/src/config/examples/Einstart-S/Configuration.h
@@ -681,6 +681,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -689,10 +697,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
index 3017436bde..a6263f6db1 100644
--- a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
+++ b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h
index f73d288cc9..a36406bc48 100644
--- a/Marlin/src/config/examples/Felix/Configuration.h
+++ b/Marlin/src/config/examples/Felix/Configuration.h
@@ -651,6 +651,14 @@
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -659,10 +667,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h
index 3ab4dbaf15..357b7c1d32 100644
--- a/Marlin/src/config/examples/Felix/Configuration_adv.h
+++ b/Marlin/src/config/examples/Felix/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h
index 897cd0dd20..76e728cd87 100644
--- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h
+++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h
@@ -651,6 +651,14 @@
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -659,10 +667,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
index d47a077478..68d80dc4a2 100644
--- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
+++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
@@ -675,6 +675,14 @@
#define DEFAULT_RETRACT_ACCELERATION 400 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -683,10 +691,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 8.5
-#define DEFAULT_YJERK 8.5
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 4.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 8.5
+ #define DEFAULT_YJERK 8.5
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 4.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 beeb79a890..f9ee661300 100644
--- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
+++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration.h
index 294f82d2e1..3bf46ead5f 100644
--- a/Marlin/src/config/examples/Formbot/Raptor/Configuration.h
+++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration.h
@@ -744,6 +744,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -752,19 +760,21 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#if ENABLED(X_SpreadCycle) || DISABLED(X_2208)
- #define DEFAULT_XJERK 20.0
-#else
- #define DEFAULT_XJERK 10.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #if ENABLED(X_SpreadCycle) || DISABLED(X_2208)
+ #define DEFAULT_XJERK 20.0
+ #else
+ #define DEFAULT_XJERK 10.0
+ #endif
+ #if ENABLED(Y_SpreadCycle) || DISABLED(Y_2208)
+ #define DEFAULT_YJERK 10.0
+ #else
+ #define DEFAULT_YJERK 5.0
+ #endif
+ #define DEFAULT_ZJERK 0.4
#endif
-#if ENABLED(Y_SpreadCycle) || DISABLED(Y_2208)
- #define DEFAULT_YJERK 10.0
-#else
- #define DEFAULT_YJERK 5.0
-#endif
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 5.0
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
index 6dc45d0b91..641f57b439 100644
--- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
+++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h
index b5c3bd84bf..8f0dd3c752 100644
--- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h
+++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h
@@ -698,6 +698,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -706,10 +714,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 12.0 // More conservitive numbers.
-#define DEFAULT_YJERK 8.0
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 12.0 // More conservative numbers.
+ #define DEFAULT_YJERK 8.0
+ #define DEFAULT_ZJERK 0.4
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 1856c14c7b..144947b19e 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
@@ -486,14 +486,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h
index 90b1812a5e..d513d253bd 100644
--- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h
+++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h
@@ -685,6 +685,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -693,15 +701,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-//#define DEFAULT_XJERK 20.0
-//#define DEFAULT_YJERK 10.0
-//#define DEFAULT_ZJERK 0.4
-//#define DEFAULT_EJERK 5.0
-
-#define DEFAULT_XJERK 12.0 // More conservitive numbers.
-#define DEFAULT_YJERK 8.0
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 12.0 // More conservative numbers.
+ #define DEFAULT_YJERK 8.0
+ #define DEFAULT_ZJERK 0.4
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 7e285aa2b0..a714ffdb9d 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
@@ -487,14 +487,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
index 56660dc457..de14fd4a9a 100644
--- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
@@ -684,6 +684,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -692,10 +700,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 4.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
index d0d9802fb6..b751953df7 100644
--- a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 5.0
-#define DEFAULT_YJERK 5.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 4.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 5.0
+ #define DEFAULT_YJERK 5.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 4.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h
index 76dc71f19d..47e75b79d9 100644
--- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h
@@ -676,6 +676,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -684,10 +692,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 0
-#define DEFAULT_YJERK 0
-#define DEFAULT_ZJERK 0.6
-#define DEFAULT_EJERK 50.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 0
+ #define DEFAULT_YJERK 0
+ #define DEFAULT_ZJERK 0.6
+#endif
+
+#define DEFAULT_EJERK 50.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h
index f7a0e4c9bc..a49c4978f6 100644
--- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.01 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
index 6654b1ea33..bb28d3e0a9 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
@@ -684,6 +684,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -692,10 +700,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
index 1300fad17a..093e154700 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
@@ -684,6 +684,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -692,10 +700,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
index c465d0caa2..54bbf36a2c 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 9160f8f9bd..0d4b9ad4b3 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
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
index 7ceba9c2cd..f40833eb2b 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 9160f8f9bd..0d4b9ad4b3 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
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
index 3629d72cff..33c2ecddb9 100644
--- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
+++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
@@ -673,6 +673,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -681,10 +689,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 e80e313ffd..53cf090fa7 100644
--- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
+++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h
index 2bb97bb773..f837e9aba4 100644
--- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h
+++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h
@@ -681,6 +681,14 @@
#define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -689,10 +697,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 8.0
-#define DEFAULT_YJERK 3.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 8.0
+ #define DEFAULT_YJERK 3.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
index d8ff9c1244..d43e13ee82 100644
--- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
+++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h
index 74049467a3..86bda597ab 100644
--- a/Marlin/src/config/examples/MakerParts/Configuration.h
+++ b/Marlin/src/config/examples/MakerParts/Configuration.h
@@ -689,6 +689,14 @@
#define DEFAULT_RETRACT_ACCELERATION 100 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION MAX_XYAXIS_ACCEL // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -697,10 +705,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 2.0
-#define DEFAULT_YJERK 2.0
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 8.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 2.0
+ #define DEFAULT_YJERK 2.0
+ #define DEFAULT_ZJERK 0.4
+#endif
+
+#define DEFAULT_EJERK 8.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h
index 8132279bb2..77961af271 100644
--- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h
+++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h
index 00868a2d96..91b3699da7 100644
--- a/Marlin/src/config/examples/Malyan/M150/Configuration.h
+++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h
@@ -689,6 +689,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 700 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -697,10 +705,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 8.0
-#define DEFAULT_YJERK 8.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 8.0
+ #define DEFAULT_YJERK 8.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
index 3283e7e486..bda98a32d5 100644
--- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
+++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h
index d7d7e8fff5..9d9eb75169 100644
--- a/Marlin/src/config/examples/Malyan/M200/Configuration.h
+++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h
@@ -668,6 +668,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -676,10 +684,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
index 4e67ed124f..ac55194dce 100644
--- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
+++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
index e653a654bd..b900e0f1b6 100644
--- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
+++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
@@ -673,6 +673,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -681,10 +689,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
index 438adecb7a..5b7bd81ac6 100644
--- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
+++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
@@ -673,6 +673,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -681,10 +689,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 dec37290d9..07144ea014 100644
--- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
+++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Mks/Robin/Configuration.h b/Marlin/src/config/examples/Mks/Robin/Configuration.h
index c995d255f0..b2a779925e 100644
--- a/Marlin/src/config/examples/Mks/Robin/Configuration.h
+++ b/Marlin/src/config/examples/Mks/Robin/Configuration.h
@@ -670,6 +670,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -678,10 +686,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h b/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h
index e0f419ad4a..069cf7c2f0 100644
--- a/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h
+++ b/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h
index df3cd49645..93dfd67427 100644
--- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h
+++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
index a2859e4d22..855aaed351 100644
--- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
+++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
index c2a7f42670..f03021f94a 100644
--- a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
+++ b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
@@ -709,6 +709,14 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -717,10 +725,13 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
index 23544ec3f2..16ec881a7a 100644
--- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h
index de2cf9fae6..6eec313e7d 100644
--- a/Marlin/src/config/examples/RigidBot/Configuration.h
+++ b/Marlin/src/config/examples/RigidBot/Configuration.h
@@ -667,6 +667,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -675,10 +683,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 8.0
-#define DEFAULT_YJERK 8.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 8.0
+ #define DEFAULT_YJERK 8.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h
index b13e4d5f58..67eaaa2557 100644
--- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h
+++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h
index dd2068edaf..3e9ff3e44c 100644
--- a/Marlin/src/config/examples/SCARA/Configuration.h
+++ b/Marlin/src/config/examples/SCARA/Configuration.h
@@ -682,6 +682,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -690,10 +698,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 5.0
-#define DEFAULT_YJERK 5.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 3.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 5.0
+ #define DEFAULT_YJERK 5.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 3.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h
index 533a032558..6df560333d 100644
--- a/Marlin/src/config/examples/SCARA/Configuration_adv.h
+++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h
index 49bd6c1f6d..f8f337aad4 100644
--- a/Marlin/src/config/examples/STM32F10/Configuration.h
+++ b/Marlin/src/config/examples/STM32F10/Configuration.h
@@ -671,6 +671,14 @@
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -679,10 +687,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 13.0
-#define DEFAULT_YJERK 13.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 13.0
+ #define DEFAULT_YJERK 13.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/STM32F4/Configuration.h b/Marlin/src/config/examples/STM32F4/Configuration.h
index 616cb48e4e..2bef5cf6f8 100644
--- a/Marlin/src/config/examples/STM32F4/Configuration.h
+++ b/Marlin/src/config/examples/STM32F4/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h
index 7c1158f304..39421421d9 100644
--- a/Marlin/src/config/examples/Sanguinololu/Configuration.h
+++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h
@@ -700,6 +700,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -708,10 +716,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
index b3a18db968..72883bd447 100644
--- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
+++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h
index b4d09dcae8..46c6a453ca 100644
--- a/Marlin/src/config/examples/TheBorg/Configuration.h
+++ b/Marlin/src/config/examples/TheBorg/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h
index cffee73c31..cfd5bb8f16 100644
--- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h
+++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h
index ac756ecbd0..8a25bcfb2a 100644
--- a/Marlin/src/config/examples/TinyBoy2/Configuration.h
+++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h
@@ -720,6 +720,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -728,10 +736,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
index 9cc0a08837..72d1a35b42 100644
--- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
+++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h
index 086acb9a8f..7c6345a031 100644
--- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 20.0
-#define DEFAULT_YJERK 20.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 20.0
+ #define DEFAULT_YJERK 20.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h
index 6f1b81cac9..ee90f78292 100644
--- a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 15.0
-#define DEFAULT_YJERK 15.0
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 15.0
+ #define DEFAULT_YJERK 15.0
+ #define DEFAULT_ZJERK 0.4
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
index 33bcfb7289..29745a5f67 100644
--- a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
+++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h
index 4459446069..399578938e 100644
--- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 18.0
-#define DEFAULT_YJERK 18.0
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 18.0
+ #define DEFAULT_YJERK 18.0
+ #define DEFAULT_ZJERK 0.4
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h
index 74e00f88a2..c6b306e176 100644
--- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h
@@ -680,6 +680,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -688,10 +696,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 20.0
-#define DEFAULT_YJERK 20.0
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 20.0
+ #define DEFAULT_YJERK 20.0
+ #define DEFAULT_ZJERK 0.4
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration.h
index 229fcc6607..9aed1aa47e 100644
--- a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h
index 4b8e4db8f2..5f473dfd6e 100644
--- a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
index 9f4638c881..9a7f3cc8ac 100644
--- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
index e05b446eb9..b13e0c288f 100644
--- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h
index d3c7dcbfcf..08e1af303f 100644
--- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h
@@ -698,6 +698,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -706,10 +714,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
index 3d212e3e0d..7223a99a9e 100644
--- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
+++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
@@ -495,14 +495,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h
index 3a6bd9ff90..952a706dcc 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 6000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.5
-#define DEFAULT_EJERK 20.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.5
+#endif
+
+#define DEFAULT_EJERK 20.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
index 9543562296..06c5bd7a0f 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
index 6846ace540..ee9387be86 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 6000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.4
-#define DEFAULT_EJERK 20.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
index 398f678ae0..2578afeb0e 100644
--- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
+++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
@@ -679,6 +679,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -687,10 +695,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 1.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 1.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 3338b1ccb1..ddbb86c8e5 100644
--- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
+++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
index bb66fe5f71..e982b8bb87 100644
--- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
+++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
@@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h
index 213d6a2e36..1073c7246c 100644
--- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h
+++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h
@@ -799,6 +799,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -807,10 +815,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 5.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK DEFAULT_XJERK
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 5.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 9bf661bf13..677bce09b6 100644
--- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
@@ -484,14 +484,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
index f0054b1fe0..786bdcbb3e 100644
--- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
@@ -751,6 +751,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -759,10 +767,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 6595ac6dd5..ae859f7b72 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
@@ -484,14 +484,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
index aa571abef4..e311b00916 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
@@ -751,6 +751,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -759,10 +767,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 6595ac6dd5..ae859f7b72 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
@@ -484,14 +484,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
index 8184108056..41665a0432 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
@@ -751,6 +751,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -759,10 +767,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 d18304297a..f39ea3c6b6 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
@@ -484,14 +484,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration.h b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration.h
index f679f0c470..937788974b 100644
--- a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration.h
+++ b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration.h
@@ -752,6 +752,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -760,10 +768,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h
index 4131c91115..a98368d1b1 100644
--- a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h
@@ -484,14 +484,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
index 951752caad..77218cf865 100644
--- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
+++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
@@ -756,6 +756,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -764,10 +772,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 20.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 20.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration.h b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration.h
index 4c0364521c..b043721214 100644
--- a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration.h
+++ b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration.h
@@ -741,6 +741,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -749,10 +757,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h
index dfcc0e7506..95c1957f31 100644
--- a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h
@@ -484,14 +484,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration.h b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration.h
index c4c8715c55..27dfc1eb9f 100644
--- a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration.h
+++ b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration.h
@@ -745,6 +745,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 5000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -753,10 +761,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h
index b6bef1765d..823683ac58 100644
--- a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h
@@ -484,14 +484,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h
index 740cb8bf18..1e664110df 100644
--- a/Marlin/src/config/examples/delta/generic/Configuration.h
+++ b/Marlin/src/config/examples/delta/generic/Configuration.h
@@ -741,6 +741,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -749,10 +757,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h
index d18304297a..f39ea3c6b6 100644
--- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h
@@ -484,14 +484,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
index d800b246e4..5244dd1ceb 100644
--- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
@@ -741,6 +741,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -749,10 +757,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 d18304297a..f39ea3c6b6 100644
--- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
@@ -484,14 +484,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
index a6178a469a..8430b8e8d5 100644
--- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
@@ -734,6 +734,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -742,10 +750,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
index b4703f7f50..2309850bed 100644
--- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
@@ -744,6 +744,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -752,10 +760,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK DEFAULT_XJERK
-#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
-#define DEFAULT_EJERK 20.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK DEFAULT_XJERK
+ #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
+#endif
+
+#define DEFAULT_EJERK 20.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 8e8d7b3aa4..f114646455 100644
--- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
@@ -484,14 +484,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
index 7e9848fdea..ccb17ee2b5 100644
--- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
+++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
@@ -682,6 +682,14 @@
#define DEFAULT_RETRACT_ACCELERATION 400 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -690,10 +698,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 8.5
-#define DEFAULT_YJERK 8.5
-#define DEFAULT_ZJERK 0.7
-#define DEFAULT_EJERK 4.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 8.5
+ #define DEFAULT_YJERK 8.5
+ #define DEFAULT_ZJERK 0.7
+#endif
+
+#define DEFAULT_EJERK 4.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
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 6cc356f76b..4dfb897de1 100644
--- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
+++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h
index 72c6d01312..e84b798191 100644
--- a/Marlin/src/config/examples/makibox/Configuration.h
+++ b/Marlin/src/config/examples/makibox/Configuration.h
@@ -672,6 +672,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -680,10 +688,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h
index 26e8150a4f..bbd647b592 100644
--- a/Marlin/src/config/examples/makibox/Configuration_adv.h
+++ b/Marlin/src/config/examples/makibox/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h
index 7d9f343221..8e875c112f 100644
--- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h
+++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h
@@ -671,6 +671,14 @@
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -679,10 +687,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 13.0
-#define DEFAULT_YJERK 13.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 13.0
+ #define DEFAULT_YJERK 13.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
index 94a6102491..7b15760499 100644
--- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
+++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
@@ -664,6 +664,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -672,10 +680,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 10.0
-#define DEFAULT_YJERK 10.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
index 85f916835d..395007065b 100644
--- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h
index b9477f1547..a5cb701340 100644
--- a/Marlin/src/config/examples/wt150/Configuration.h
+++ b/Marlin/src/config/examples/wt150/Configuration.h
@@ -674,6 +674,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1200 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves
+//
+// Use Junction Deviation instead of traditional Jerk Limiting
+//
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
+#endif
+
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E
@@ -682,10 +690,13 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-#define DEFAULT_XJERK 8.0
-#define DEFAULT_YJERK 8.0
-#define DEFAULT_ZJERK 0.3
-#define DEFAULT_EJERK 5.0
+#if DISABLED(JUNCTION_DEVIATION)
+ #define DEFAULT_XJERK 8.0
+ #define DEFAULT_YJERK 8.0
+ #define DEFAULT_ZJERK 0.3
+#endif
+
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* S-Curve Acceleration
diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h
index b6d7811b17..beb5a7b431 100644
--- a/Marlin/src/config/examples/wt150/Configuration_adv.h
+++ b/Marlin/src/config/examples/wt150/Configuration_adv.h
@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
-//
-// Use Junction Deviation instead of traditional Jerk Limiting
-//
-//#define JUNCTION_DEVIATION
-#if ENABLED(JUNCTION_DEVIATION)
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
-#endif
-
//
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 8869d99c80..eac085153e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1121,7 +1121,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
#endif
-#if HAS_MESH
+#if HAS_MESH && DISABLED(JUNCTION_DEVIATION)
static_assert(DEFAULT_ZJERK > 0.1, "Low DEFAULT_ZJERK values are incompatible with mesh-based leveling.");
#elif ENABLED(G26_MESH_VALIDATION)
#error "G26_MESH_VALIDATION requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 9d7451588e..5849c683c9 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -487,9 +487,6 @@ void MarlinSettings::postprocess() {
dummy = float(DEFAULT_EJERK);
EEPROM_WRITE(dummy);
#endif
- #else
- const float planner_max_jerk[XYZE] = { float(DEFAULT_XJERK), float(DEFAULT_YJERK), float(DEFAULT_ZJERK), float(DEFAULT_EJERK) };
- EEPROM_WRITE(planner_max_jerk);
#endif
#if ENABLED(JUNCTION_DEVIATION)
--
GitLab