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

Update some precompiler tests

Browse Source
This commit is contained in:
Scott Lahteine
2019-07-14 08:56:29 -05:00
committed by Scott Lahteine
parent ce02c6cee2
commit eaf1c0954e
8 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2252,7 +2252,7 @@ void MarlinSettings::reset() {
planner.max_jerk[X_AXIS] = DEFAULT_XJERK;
planner.max_jerk[Y_AXIS] = DEFAULT_YJERK;
planner.max_jerk[Z_AXIS] = DEFAULT_ZJERK;
#if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
planner.max_jerk[E_AXIS] = DEFAULT_EJERK;
#endif
#endif
@@ -2768,7 +2768,7 @@ void MarlinSettings::reset() {
#endif
#if HAS_CLASSIC_JERK
SERIAL_ECHOPGM(" X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>");
#if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
SERIAL_ECHOPGM(" E<max_e_jerk>");
#endif
#endif
@@ -2786,7 +2786,7 @@ void MarlinSettings::reset() {
, " X", LINEAR_UNIT(planner.max_jerk[X_AXIS])
, " Y", LINEAR_UNIT(planner.max_jerk[Y_AXIS])
, " Z", LINEAR_UNIT(planner.max_jerk[Z_AXIS])
#if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
, " E", LINEAR_UNIT(planner.max_jerk[E_AXIS])
#endif
#endif