|
@ -47,7 +47,7 @@ |
|
|
#include "../feature/bedlevel/bedlevel.h" |
|
|
#include "../feature/bedlevel/bedlevel.h" |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if HAS_AXIS_UNHOMED_ERR && (ENABLED(ULTRA_LCD) || ENABLED(EXTENSIBLE_UI)) |
|
|
#if ENABLED(ULTRA_LCD) || ENABLED(EXTENSIBLE_UI) |
|
|
#include "../lcd/ultralcd.h" |
|
|
#include "../lcd/ultralcd.h" |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
@ -1036,8 +1036,6 @@ void prepare_move_to_destination() { |
|
|
set_current_from_destination(); |
|
|
set_current_from_destination(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
#if HAS_AXIS_UNHOMED_ERR |
|
|
|
|
|
|
|
|
|
|
|
bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) { |
|
|
bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) { |
|
|
#if ENABLED(HOME_AFTER_DEACTIVATE) |
|
|
#if ENABLED(HOME_AFTER_DEACTIVATE) |
|
|
const bool xx = x && !TEST(axis_known_position, X_AXIS), |
|
|
const bool xx = x && !TEST(axis_known_position, X_AXIS), |
|
@ -1051,9 +1049,9 @@ void prepare_move_to_destination() { |
|
|
if (xx || yy || zz) { |
|
|
if (xx || yy || zz) { |
|
|
SERIAL_ECHO_START(); |
|
|
SERIAL_ECHO_START(); |
|
|
SERIAL_ECHOPGM(MSG_HOME " "); |
|
|
SERIAL_ECHOPGM(MSG_HOME " "); |
|
|
if (xx) SERIAL_ECHOPGM(MSG_X); |
|
|
if (xx) SERIAL_CHAR('X'); |
|
|
if (yy) SERIAL_ECHOPGM(MSG_Y); |
|
|
if (yy) SERIAL_CHAR('Y'); |
|
|
if (zz) SERIAL_ECHOPGM(MSG_Z); |
|
|
if (zz) SERIAL_CHAR('Z'); |
|
|
SERIAL_ECHOLNPGM(" " MSG_FIRST); |
|
|
SERIAL_ECHOLNPGM(" " MSG_FIRST); |
|
|
|
|
|
|
|
|
#if ENABLED(ULTRA_LCD) || ENABLED(EXTENSIBLE_UI) |
|
|
#if ENABLED(ULTRA_LCD) || ENABLED(EXTENSIBLE_UI) |
|
@ -1064,8 +1062,6 @@ void prepare_move_to_destination() { |
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
#endif // HAS_AXIS_UNHOMED_ERR
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
/**
|
|
|
* Homing bump feedrate (mm/s) |
|
|
* Homing bump feedrate (mm/s) |
|
|
*/ |
|
|
*/ |
|
|