Skip to content

Commit 90a8fd9

Browse files
committed
Move DEFAULT_EJERK to CLASSIC_JERK settings
1 parent ab34971 commit 90a8fd9

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Marlin/Configuration.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -1291,6 +1291,7 @@
12911291
#define DEFAULT_XJERK 10.0
12921292
#define DEFAULT_YJERK 10.0
12931293
#define DEFAULT_ZJERK 0.3
1294+
#define DEFAULT_EJERK 5.0
12941295
//#define DEFAULT_IJERK 0.3
12951296
//#define DEFAULT_JJERK 0.3
12961297
//#define DEFAULT_KJERK 0.3
@@ -1306,8 +1307,6 @@
13061307
#endif
13071308
#endif
13081309

1309-
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
1310-
13111310
/**
13121311
* Junction Deviation Factor
13131312
*

Marlin/Configuration_adv.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -2319,7 +2319,9 @@
23192319
#endif
23202320
//#define ADVANCE_K_EXTRA // Add a second linear advance constant, configurable with M900 L.
23212321
//#define LA_DEBUG // Print debug information to serial during operation. Disable for production use.
2322-
//#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
2322+
#if ENABLED(CLASSIC_JERK)
2323+
//#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
2324+
#endif
23232325
//#define EXPERIMENTAL_I2S_LA // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz.
23242326
#endif
23252327

Marlin/src/gcode/host/M360.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void GcodeSuite::M360() {
182182
config_line(F("NumExtruder"), EXTRUDERS);
183183
#if HAS_EXTRUDERS
184184
EXTRUDER_LOOP() {
185-
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)));
185+
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, 10)));
186186
config_line_e(e, F("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]);
187187
config_line_e(e, F("Acceleration"), planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(e)]);
188188
config_line_e(e, F("Diameter"), TERN(NO_VOLUMETRICS, DEFAULT_NOMINAL_FILAMENT_DIA, planner.filament_size[e]));

Marlin/src/module/settings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ void MarlinSettings::postprocess() {
856856
EEPROM_WRITE(dummyf);
857857
#endif
858858
#else
859-
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);
859+
const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(10, 10, 10, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4);
860860
EEPROM_WRITE(planner_max_jerk);
861861
#endif
862862

0 commit comments

Comments
 (0)