bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 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

2
Marlin/src/gcode/config/M200-M205.cpp
View File

@ -161,7 +161,7 @@ void GcodeSuite::M205() {
SERIAL_ECHOLNPGM("WARNING! Low Z Jerk may lead to unwanted pauses.");
#endif
}
#if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
if (parser.seen('E')) planner.max_jerk[E_AXIS] = parser.value_linear_units();
#endif
#endif

2
Marlin/src/gcode/config/M92.cpp
View File

@ -76,7 +76,7 @@ void GcodeSuite::M92() {
const float value = parser.value_per_axis_units((AxisEnum)(E_AXIS_N(target_extruder)));
if (value < 20) {
float factor = planner.settings.axis_steps_per_mm[E_AXIS_N(target_extruder)] / value; // increase e constants if M92 E14 is given for netfab.
#if HAS_CLASSIC_JERK && (DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE))
#if HAS_CLASSIC_JERK && !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
planner.max_jerk[E_AXIS] *= factor;
#endif
planner.settings.max_feedrate_mm_s[E_AXIS_N(target_extruder)] *= factor;