Change Junction Deviation to Classic Jerk (#15505)
This commit is contained in:
parent
3664beec29
commit
ac466ecf74
@ -525,7 +525,7 @@ void MarlinSettings::postprocess() {
|
|||||||
EEPROM_WRITE(planner_max_jerk);
|
EEPROM_WRITE(planner_max_jerk);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if DISABLED(CLASSIC_JERK)
|
||||||
EEPROM_WRITE(planner.junction_deviation_mm);
|
EEPROM_WRITE(planner.junction_deviation_mm);
|
||||||
#else
|
#else
|
||||||
dummy = 0.02f;
|
dummy = 0.02f;
|
||||||
@ -1323,7 +1323,7 @@ void MarlinSettings::postprocess() {
|
|||||||
for (uint8_t q = 4; q--;) EEPROM_READ(dummy);
|
for (uint8_t q = 4; q--;) EEPROM_READ(dummy);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if DISABLED(CLASSIC_JERK)
|
||||||
EEPROM_READ(planner.junction_deviation_mm);
|
EEPROM_READ(planner.junction_deviation_mm);
|
||||||
#else
|
#else
|
||||||
EEPROM_READ(dummy);
|
EEPROM_READ(dummy);
|
||||||
@ -2235,7 +2235,7 @@ void MarlinSettings::reset() {
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if DISABLED(CLASSIC_JERK)
|
||||||
planner.junction_deviation_mm = float(JUNCTION_DEVIATION_MM);
|
planner.junction_deviation_mm = float(JUNCTION_DEVIATION_MM);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -2744,7 +2744,7 @@ void MarlinSettings::reset() {
|
|||||||
if (!forReplay) {
|
if (!forReplay) {
|
||||||
CONFIG_ECHO_START();
|
CONFIG_ECHO_START();
|
||||||
SERIAL_ECHOPGM("Advanced: B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>");
|
SERIAL_ECHOPGM("Advanced: B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>");
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if DISABLED(CLASSIC_JERK)
|
||||||
SERIAL_ECHOPGM(" J<junc_dev>");
|
SERIAL_ECHOPGM(" J<junc_dev>");
|
||||||
#endif
|
#endif
|
||||||
#if HAS_CLASSIC_JERK
|
#if HAS_CLASSIC_JERK
|
||||||
@ -2760,7 +2760,7 @@ void MarlinSettings::reset() {
|
|||||||
" M205 B", LINEAR_UNIT(planner.settings.min_segment_time_us)
|
" M205 B", LINEAR_UNIT(planner.settings.min_segment_time_us)
|
||||||
, " S", LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
|
, " S", LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
|
||||||
, " T", LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
|
, " T", LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if DISABLED(CLASSIC_JERK)
|
||||||
, " J", LINEAR_UNIT(planner.junction_deviation_mm)
|
, " J", LINEAR_UNIT(planner.junction_deviation_mm)
|
||||||
#endif
|
#endif
|
||||||
#if HAS_CLASSIC_JERK
|
#if HAS_CLASSIC_JERK
|
||||||
|
Loading…
Reference in New Issue
Block a user