Move JD to Config.h (and fix jerk->eeprom bug) (#12720)

6 years ago · cfc5e96b4b
148 changed files with 1251 additions and 852 deletions
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  8.0
  #define DEFAULT_YJERK  8.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                 10.0
+#endif
+
+#define DEFAULT_EJERK   10.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  8.0
  #define DEFAULT_YJERK  8.0
  #define DEFAULT_ZJERK  0.4
-#define DEFAULT_EJERK                  1.5
+#endif
+
+#define DEFAULT_EJERK    1.5  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  7.0
  #define DEFAULT_YJERK  7.0
  #define DEFAULT_ZJERK  0.65
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  7.0
  #define DEFAULT_YJERK  7.0
  #define DEFAULT_ZJERK  0.65
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  5.0
  #define DEFAULT_YJERK  5.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                 10.0
+#endif
+
+#define DEFAULT_EJERK   10.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  2.7
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.4
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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
+#if DISABLED(JUNCTION_DEVIATION)
+  #define DEFAULT_XJERK 10.0
+  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.4
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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
+#if DISABLED(JUNCTION_DEVIATION)
+  #define DEFAULT_XJERK 10.0
+  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  2.4
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  8.5
  #define DEFAULT_YJERK  8.5
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  4.0
+#endif
+
+#define DEFAULT_EJERK    4.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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 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
-#define DEFAULT_EJERK      5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
+#if DISABLED(JUNCTION_DEVIATION)
+  #define DEFAULT_XJERK 12.0  // More conservative numbers.
  #define DEFAULT_YJERK  8.0
  #define DEFAULT_ZJERK  0.4
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
+#if DISABLED(JUNCTION_DEVIATION)
+  #define DEFAULT_XJERK 12.0  // More conservative numbers.
  #define DEFAULT_YJERK  8.0
  #define DEFAULT_ZJERK  0.4
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    4.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  5.0
  #define DEFAULT_YJERK  5.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  4.0
+#endif
+
+#define DEFAULT_EJERK    4.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  0
  #define DEFAULT_YJERK  0
  #define DEFAULT_ZJERK  0.6
-#define DEFAULT_EJERK                 50.0
+#endif
+
+#define DEFAULT_EJERK   50.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- a/Marlin/src/config/examples/Geeetech/Prusa
+++ b/Marlin/src/config/examples/Geeetech/Prusa
@ -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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- a/Marlin/src/config/examples/Geeetech/Prusa
+++ b/Marlin/src/config/examples/Geeetech/Prusa
@ -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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- a/Marlin/src/config/examples/Geeetech/Prusa
+++ b/Marlin/src/config/examples/Geeetech/Prusa
@ -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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- a/Marlin/src/config/examples/Geeetech/Prusa
+++ b/Marlin/src/config/examples/Geeetech/Prusa
@ -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.
--- a/Marlin/src/config/examples/Geeetech/Prusa
+++ b/Marlin/src/config/examples/Geeetech/Prusa
@ -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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- a/Marlin/src/config/examples/Geeetech/Prusa
+++ b/Marlin/src/config/examples/Geeetech/Prusa
@ -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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  8.0
  #define DEFAULT_YJERK  3.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  2.0
  #define DEFAULT_YJERK  2.0
  #define DEFAULT_ZJERK  0.4
-#define DEFAULT_EJERK                  8.0
+#endif
+
+#define DEFAULT_EJERK    8.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  8.0
  #define DEFAULT_YJERK  8.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#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
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#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
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  8.0
  #define DEFAULT_YJERK  8.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK  5.0
  #define DEFAULT_YJERK  5.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  3.0
+#endif
+
+#define DEFAULT_EJERK    3.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 13.0
  #define DEFAULT_YJERK 13.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 10.0
  #define DEFAULT_YJERK 10.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 20.0
  #define DEFAULT_YJERK 20.0
  #define DEFAULT_ZJERK  0.3
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration
--- 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.
 */
+#if DISABLED(JUNCTION_DEVIATION)
  #define DEFAULT_XJERK 15.0
  #define DEFAULT_YJERK 15.0
  #define DEFAULT_ZJERK  0.4
-#define DEFAULT_EJERK                  5.0
+#endif
+
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance

 /**
 * S-Curve Acceleration