Merge branch 'bugfix-2.1.x' of github.com:MarlinFirmware/Marlin into …

…leo_1S_S6_btt_mini
JaxTheWolf · Jan 20, 2024 · d793d1f · d793d1f
2 parents 6c32246 + d7e4536
commit d793d1f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1291,6 +1291,7 @@
   #define DEFAULT_XJERK 10.0
   #define DEFAULT_YJERK 10.0
   #define DEFAULT_ZJERK  0.3
+  #define DEFAULT_EJERK  5.0
   //#define DEFAULT_IJERK  0.3
   //#define DEFAULT_JJERK  0.3
   //#define DEFAULT_KJERK  0.3
@@ -1306,8 +1307,6 @@
   #endif
 #endif
 
-#define DEFAULT_EJERK    5.0  // May be used by Linear Advance
-
 /**
  * Junction Deviation Factor
  *

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -2320,7 +2320,9 @@
   #endif
   //#define ADVANCE_K_EXTRA       // Add a second linear advance constant, configurable with M900 L.
   //#define LA_DEBUG              // Print debug information to serial during operation. Disable for production use.
-  //#define ALLOW_LOW_EJERK       // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
+  #if ENABLED(CLASSIC_JERK)
+    //#define ALLOW_LOW_EJERK     // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
+  #endif
   //#define EXPERIMENTAL_I2S_LA   // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz.
 #endif
 

diff --git a/Marlin/Version.h b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2024-01-19"
+//#define STRING_DISTRIBUTION_DATE "2024-01-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

diff --git a/Marlin/src/gcode/host/M360.cpp b/Marlin/src/gcode/host/M360.cpp
@@ -182,7 +182,11 @@ void GcodeSuite::M360() {
   config_line(F("NumExtruder"), EXTRUDERS);
   #if HAS_EXTRUDERS
     EXTRUDER_LOOP() {
-      config_line_e(e, JERK_STR, TERN(HAS_LINEAR_E_JERK, planner.max_e_jerk[E_INDEX_N(e)], TERN(CLASSIC_JERK, planner.max_jerk.e, DEFAULT_EJERK)));
+      #if HAS_LINEAR_E_JERK
+        config_line_e(e, JERK_STR, planner.max_e_jerk[E_INDEX_N(e)]);
+      #elif ENABLED(CLASSIC_JERK)
+        config_line_e(e, JERK_STR, planner.max_jerk.e);
+      #endif
       config_line_e(e, F("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]);
       config_line_e(e, F("Acceleration"), planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(e)]);
       config_line_e(e, F("Diameter"), TERN(NO_VOLUMETRICS, DEFAULT_NOMINAL_FILAMENT_DIA, planner.filament_size[e]));

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2024-01-19"
+  #define STRING_DISTRIBUTION_DATE "2024-01-20"
 #endif
 
 /**

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
@@ -3386,8 +3386,12 @@ void Planner::set_max_feedrate(const AxisEnum axis, float inMaxFeedrateMMS) {
         #ifdef MAX_JERK_EDIT_VALUES
           MAX_JERK_EDIT_VALUES
         #else
-          { (DEFAULT_XJERK) * 2, (DEFAULT_YJERK) * 2,
-            (DEFAULT_ZJERK) * 2, (DEFAULT_EJERK) * 2 }
+          LOGICAL_AXIS_ARRAY(
+            (DEFAULT_EJERK) * 2,
+            (DEFAULT_XJERK) * 2, (DEFAULT_YJERK) * 2, (DEFAULT_ZJERK) * 2,
+            (DEFAULT_IJERK) * 2, (DEFAULT_JJERK) * 2, (DEFAULT_KJERK) * 2,
+            (DEFAULT_UJERK) * 2, (DEFAULT_VJERK) * 2, (DEFAULT_WJERK) * 2
+          )
         #endif
       ;
       limit_and_warn(inMaxJerkMMS, axis, F("Jerk"), max_jerk_edit);

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
@@ -856,7 +856,7 @@ void MarlinSettings::postprocess() {
           EEPROM_WRITE(dummyf);
         #endif
       #else
-        const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(float(DEFAULT_EJERK), 10, 10, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4);
+        const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(5, 10, 10, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4);
         EEPROM_WRITE(planner_max_jerk);
       #endif
 

diff --git a/ini/features.ini b/ini/features.ini
@@ -365,6 +365,7 @@ NEED_LSF                               = build_src_filter=+<src/libs/least_squar
 NOZZLE_PARK_FEATURE                    = build_src_filter=+<src/libs/nozzle.cpp> +<src/gcode/feature/pause/G27.cpp>
 NOZZLE_CLEAN_FEATURE                   = build_src_filter=+<src/libs/nozzle.cpp> +<src/gcode/feature/clean>
 DELTA                                  = build_src_filter=+<src/module/delta.cpp> +<src/gcode/calibrate/M666.cpp>
+POLAR                                  = build_src_filter=+<src/module/polar.cpp>
 POLARGRAPH                             = build_src_filter=+<src/module/polargraph.cpp>
 BEZIER_CURVE_SUPPORT                   = build_src_filter=+<src/module/planner_bezier.cpp> +<src/gcode/motion/G5.cpp>
 PRINTCOUNTER                           = build_src_filter=+<src/module/printcounter.cpp>