andrey/Marlin_FB4S
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Обновление с офф. гита

Browse Source
This commit is contained in:
Sergey
2020-07-31 17:40:05 +03:00
parent 8dd26c1a3e
commit d4ba67ff2c
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/gcode/calibrate/G28.cpp
View File

@@ -312,14 +312,14 @@ void GcodeSuite::G28() {
#endif
const float z_homing_height =
ENABLED(UNKNOWN_Z_NO_RAISE) && TEST(axis_known_position, Z_AXIS)
ENABLED(UNKNOWN_Z_NO_RAISE) && !TEST(axis_known_position, Z_AXIS)
? 0
: (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT);
if (z_homing_height && (doX || doY || (ENABLED(Z_SAFE_HOMING) && doZ))) {
// Raise Z before homing any other axes and z is not already high enough (never lower z)
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Raise Z (before homing) by ", z_homing_height);
do_z_clearance(z_homing_height, TEST(axis_known_position, Z_AXIS), DISABLED(UNKNOWN_Z_NO_RAISE));
do_z_clearance(z_homing_height, true, DISABLED(UNKNOWN_Z_NO_RAISE));
}
#if ENABLED(QUICK_HOME)