|
@@ -525,7 +525,7 @@ void MarlinSettings::postprocess() {
|
525
|
525
|
EEPROM_WRITE(planner_max_jerk);
|
526
|
526
|
#endif
|
527
|
527
|
|
528
|
|
- #if ENABLED(JUNCTION_DEVIATION)
|
|
528
|
+ #if DISABLED(CLASSIC_JERK)
|
529
|
529
|
EEPROM_WRITE(planner.junction_deviation_mm);
|
530
|
530
|
#else
|
531
|
531
|
dummy = 0.02f;
|
|
@@ -1323,7 +1323,7 @@ void MarlinSettings::postprocess() {
|
1323
|
1323
|
for (uint8_t q = 4; q--;) EEPROM_READ(dummy);
|
1324
|
1324
|
#endif
|
1325
|
1325
|
|
1326
|
|
- #if ENABLED(JUNCTION_DEVIATION)
|
|
1326
|
+ #if DISABLED(CLASSIC_JERK)
|
1327
|
1327
|
EEPROM_READ(planner.junction_deviation_mm);
|
1328
|
1328
|
#else
|
1329
|
1329
|
EEPROM_READ(dummy);
|
|
@@ -2235,7 +2235,7 @@ void MarlinSettings::reset() {
|
2235
|
2235
|
#endif
|
2236
|
2236
|
#endif
|
2237
|
2237
|
|
2238
|
|
- #if ENABLED(JUNCTION_DEVIATION)
|
|
2238
|
+ #if DISABLED(CLASSIC_JERK)
|
2239
|
2239
|
planner.junction_deviation_mm = float(JUNCTION_DEVIATION_MM);
|
2240
|
2240
|
#endif
|
2241
|
2241
|
|
|
@@ -2744,7 +2744,7 @@ void MarlinSettings::reset() {
|
2744
|
2744
|
if (!forReplay) {
|
2745
|
2745
|
CONFIG_ECHO_START();
|
2746
|
2746
|
SERIAL_ECHOPGM("Advanced: B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>");
|
2747
|
|
- #if ENABLED(JUNCTION_DEVIATION)
|
|
2747
|
+ #if DISABLED(CLASSIC_JERK)
|
2748
|
2748
|
SERIAL_ECHOPGM(" J<junc_dev>");
|
2749
|
2749
|
#endif
|
2750
|
2750
|
#if HAS_CLASSIC_JERK
|
|
@@ -2760,7 +2760,7 @@ void MarlinSettings::reset() {
|
2760
|
2760
|
" M205 B", LINEAR_UNIT(planner.settings.min_segment_time_us)
|
2761
|
2761
|
, " S", LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
|
2762
|
2762
|
, " T", LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
|
2763
|
|
- #if ENABLED(JUNCTION_DEVIATION)
|
|
2763
|
+ #if DISABLED(CLASSIC_JERK)
|
2764
|
2764
|
, " J", LINEAR_UNIT(planner.junction_deviation_mm)
|
2765
|
2765
|
#endif
|
2766
|
2766
|
#if HAS_CLASSIC_JERK
|