|
|
|
@ -4004,23 +4004,21 @@ inline void gcode_G28(const bool always_home_all) {
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (home_all || homeX || homeY) {
|
|
|
|
|
// Raise Z before homing any other axes and z is not already high enough (never lower z)
|
|
|
|
|
destination[Z_AXIS] = Z_HOMING_HEIGHT;
|
|
|
|
|
if (destination[Z_AXIS] > current_position[Z_AXIS]) {
|
|
|
|
|
if (home_all || homeX || homeY) {
|
|
|
|
|
// Raise Z before homing any other axes and z is not already high enough (never lower z)
|
|
|
|
|
destination[Z_AXIS] = Z_HOMING_HEIGHT;
|
|
|
|
|
if (destination[Z_AXIS] > current_position[Z_AXIS]) {
|
|
|
|
|
|
|
|
|
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
|
|
|
|
if (DEBUGGING(LEVELING))
|
|
|
|
|
SERIAL_ECHOLNPAIR("Raise Z (before homing) to ", destination[Z_AXIS]);
|
|
|
|
|
#endif
|
|
|
|
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
|
|
|
|
if (DEBUGGING(LEVELING))
|
|
|
|
|
SERIAL_ECHOLNPAIR("Raise Z (before homing) to ", destination[Z_AXIS]);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
do_blocking_move_to_z(destination[Z_AXIS]);
|
|
|
|
|
}
|
|
|
|
|
do_blocking_move_to_z(destination[Z_AXIS]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if ENABLED(QUICK_HOME)
|
|
|
|
|
|
|
|
|
|