sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable junction deviation by default (#15481)

Browse Source
This commit is contained in:
Scott Lahteine
2019-10-08 19:42:18 -05:00
committed by GitHub
parent 1df6c7a46c
commit c0005e939c
144 changed files with 1930 additions and 2164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/module/configuration_store.cpp
View File

@@ -398,7 +398,7 @@ void MarlinSettings::postprocess() {
fwretract.refresh_autoretract();
#endif
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
#if HAS_LINEAR_E_JERK
planner.recalculate_max_e_jerk();
#endif
@@ -516,7 +516,7 @@ void MarlinSettings::postprocess() {
#if HAS_CLASSIC_JERK
EEPROM_WRITE(planner.max_jerk);
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
#if HAS_LINEAR_E_JERK
dummy = float(DEFAULT_EJERK);
EEPROM_WRITE(dummy);
#endif
@@ -1316,7 +1316,7 @@ void MarlinSettings::postprocess() {
#if HAS_CLASSIC_JERK
EEPROM_READ(planner.max_jerk);
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
#if HAS_LINEAR_E_JERK
EEPROM_READ(dummy);
#endif
#else
@@ -2230,7 +2230,7 @@ void MarlinSettings::reset() {
#define DEFAULT_ZJERK 0
#endif
planner.max_jerk.set(DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK);
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
#if HAS_CLASSIC_E_JERK
planner.max_jerk.e = DEFAULT_EJERK;
#endif
#endif
@@ -2749,7 +2749,7 @@ void MarlinSettings::reset() {
#endif
#if HAS_CLASSIC_JERK
SERIAL_ECHOPGM(" X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>");
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
#if HAS_CLASSIC_E_JERK
SERIAL_ECHOPGM(" E<max_e_jerk>");
#endif
#endif
@@ -2767,7 +2767,7 @@ void MarlinSettings::reset() {
, " X", LINEAR_UNIT(planner.max_jerk.x)
, " Y", LINEAR_UNIT(planner.max_jerk.y)
, " Z", LINEAR_UNIT(planner.max_jerk.z)
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
#if HAS_CLASSIC_E_JERK
, " E", LINEAR_UNIT(planner.max_jerk.e)
#endif
#endif