From dd169b7ccad63f601163d612cf24a787c5fb02a3 Mon Sep 17 00:00:00 2001
From: Knutwurst <36196269+knutwurst@users.noreply.github.com>
Date: Fri, 5 Nov 2021 11:02:47 +0100
Subject: [PATCH] Reenable Linear Advance on all models which was disabled
 since Update to 2.0.9.2

---
 Marlin/Configuration.h     | 22 +++-------------------
 Marlin/Configuration_adv.h |  4 ++--
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 311de431..bebbbf93 100755
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1285,9 +1285,7 @@
  * value set here, it may happen instantaneously.
  */
 
-#if ANY(KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P, KNUTWURST_MEGA_X, KNUTWURST_CHIRON)
-  #define CLASSIC_JERK
-#endif
+#define CLASSIC_JERK
 
 #if ENABLED(CLASSIC_JERK)
   #if ANY(KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P)
@@ -1316,21 +1314,7 @@
   #endif
 #endif
 
-#if ANY(KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P)
-    #define DEFAULT_EJERK    5.0  // May be used by Linear Advance
-#endif
-
-#if ENABLED(KNUTWURST_MEGA_X)
-    #define DEFAULT_EJERK    8.0  // May be used by Linear Advance
-#endif
-
-#if ENABLED(KNUTWURST_CHIRON)
-    #define DEFAULT_EJERK    8.0  // May be used by Linear Advance
-#endif
-
-#if EITHER(KNUTWURST_4MAX, KNUTWURST_4MAXP2)
-  #define DEFAULT_EJERK    6.0  // May be used by Linear Advance
-#endif
+#define DEFAULT_EJERK    10.0  // May be used by Linear Advance
 
 /**
  * Junction Deviation Factor
@@ -1356,7 +1340,7 @@
     #define JUNCTION_DEVIATION_MM 0.016 // (mm) Distance from real junction edge
   #endif
 
-  //#define JD_HANDLE_SMALL_SEGMENTS    // Use curvature estimation instead of just the junction angle
+  #define JD_HANDLE_SMALL_SEGMENTS    // Use curvature estimation instead of just the junction angle
                                       // for small segments (< 1mm) with large junction angles (> 135°).
 #endif
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 22176e68..87f1453d 100755
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1945,12 +1945,12 @@
  *
  * See https://marlinfw.org/docs/features/lin_advance.html for full instructions.
  */
-//#define LIN_ADVANCE // TODO: Disabled on update to Marlin 2.0.9 (error in combiniaton with S_CURVE_ACCELERATION)
+#define LIN_ADVANCE
 #if ENABLED(LIN_ADVANCE)
   //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
   #define LIN_ADVANCE_K 0.0     // Unit: mm compression per 1mm/s extruder speed
   //#define LA_DEBUG            // If enabled, this will generate debug information output over USB.
-  //#define EXPERIMENTAL_SCURVE // Enable this option to permit S-Curve Acceleration
+  #define EXPERIMENTAL_SCURVE   // Enable this option to permit S-Curve Acceleration
 #endif
 
 // @section leveling