From da96607b65ecc910178413d6979c128add9d098e Mon Sep 17 00:00:00 2001 From: Vovodroid Date: Sat, 20 Jan 2024 00:38:25 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A7=20Adjust=20DEFAULT=5FEJERK=20s?= =?UTF-8?q?ettings=20(#26665)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration.h | 3 +-- Marlin/Configuration_adv.h | 4 +++- Marlin/src/gcode/host/M360.cpp | 6 +++++- Marlin/src/module/planner.cpp | 8 ++++++-- Marlin/src/module/settings.cpp | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6e4afa16c6a5..7e069e7d68af 100644 --- 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 index 4a6882a209e1..1126f82553fc 100644 --- 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/src/gcode/host/M360.cpp b/Marlin/src/gcode/host/M360.cpp index 3986200e0809..8d6bb4771a0e 100644 --- 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/module/planner.cpp b/Marlin/src/module/planner.cpp index 6371a960a7d1..0ace6e32ced8 100644 --- 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 index da62a4278199..6a20488f6dfb 100644 --- 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 From 388c7018c44036ee75af9dac39f2f0b386bf7089 Mon Sep 17 00:00:00 2001 From: thinkyhead Date: Sat, 20 Jan 2024 00:21:13 +0000 Subject: [PATCH 2/3] [cron] Bump distribution date (2024-01-20) --- Marlin/Version.h | 2 +- Marlin/src/inc/Version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index 539f1106290b..bdecf7b0866a 100644 --- 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/inc/Version.h b/Marlin/src/inc/Version.h index 3cc095cd80a9..1e26c29e7c3d 100644 --- 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 /** From d7e45367afaf6a6007b6a89ff7eeefe5fa0c59ff Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Sat, 20 Jan 2024 19:24:30 +1300 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A8=20Fix=20POLAR=20build=20(#2668?= =?UTF-8?q?7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ini/features.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/ini/features.ini b/ini/features.ini index 8e0cb964f18b..4baa2566f04d 100644 --- a/ini/features.ini +++ b/ini/features.ini @@ -365,6 +365,7 @@ NEED_LSF = build_src_filter=+ + NOZZLE_CLEAN_FEATURE = build_src_filter=+ + DELTA = build_src_filter=+ + +POLAR = build_src_filter=+ POLARGRAPH = build_src_filter=+ BEZIER_CURVE_SUPPORT = build_src_filter=+ + PRINTCOUNTER = build_src_filter=+