|
@@ -1706,10 +1706,6 @@ inline void do_blocking_move_to_z(float z, float feed_rate = 0.0) {
|
1706
|
1706
|
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z, feed_rate);
|
1707
|
1707
|
}
|
1708
|
1708
|
|
1709
|
|
-inline void do_blocking_move_to_xy(float x, float y, float feed_rate = 0.0) {
|
1710
|
|
- do_blocking_move_to(x, y, current_position[Z_AXIS], feed_rate);
|
1711
|
|
-}
|
1712
|
|
-
|
1713
|
1709
|
//
|
1714
|
1710
|
// Prepare to do endstop or probe moves
|
1715
|
1711
|
// with custom feedrates.
|
|
@@ -1760,31 +1756,33 @@ static void clean_up_after_endstop_or_probe_move() {
|
1760
|
1756
|
|
1761
|
1757
|
#endif //HAS_BED_PROBE
|
1762
|
1758
|
|
1763
|
|
-static bool axis_unhomed_error(const bool x, const bool y, const bool z) {
|
1764
|
|
- const bool xx = x && !axis_homed[X_AXIS],
|
1765
|
|
- yy = y && !axis_homed[Y_AXIS],
|
1766
|
|
- zz = z && !axis_homed[Z_AXIS];
|
1767
|
|
- if (xx || yy || zz) {
|
1768
|
|
- SERIAL_ECHO_START;
|
1769
|
|
- SERIAL_ECHOPGM(MSG_HOME " ");
|
1770
|
|
- if (xx) SERIAL_ECHOPGM(MSG_X);
|
1771
|
|
- if (yy) SERIAL_ECHOPGM(MSG_Y);
|
1772
|
|
- if (zz) SERIAL_ECHOPGM(MSG_Z);
|
1773
|
|
- SERIAL_ECHOLNPGM(" " MSG_FIRST);
|
1774
|
|
-
|
1775
|
|
- #if ENABLED(ULTRA_LCD)
|
1776
|
|
- char message[3 * (LCD_WIDTH) + 1] = ""; // worst case is kana.utf with up to 3*LCD_WIDTH+1
|
1777
|
|
- strcat_P(message, PSTR(MSG_HOME " "));
|
1778
|
|
- if (xx) strcat_P(message, PSTR(MSG_X));
|
1779
|
|
- if (yy) strcat_P(message, PSTR(MSG_Y));
|
1780
|
|
- if (zz) strcat_P(message, PSTR(MSG_Z));
|
1781
|
|
- strcat_P(message, PSTR(" " MSG_FIRST));
|
1782
|
|
- lcd_setstatus(message);
|
1783
|
|
- #endif
|
1784
|
|
- return true;
|
|
1759
|
+#if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(Z_SAFE_HOMING) || HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE)
|
|
1760
|
+ static bool axis_unhomed_error(const bool x, const bool y, const bool z) {
|
|
1761
|
+ const bool xx = x && !axis_homed[X_AXIS],
|
|
1762
|
+ yy = y && !axis_homed[Y_AXIS],
|
|
1763
|
+ zz = z && !axis_homed[Z_AXIS];
|
|
1764
|
+ if (xx || yy || zz) {
|
|
1765
|
+ SERIAL_ECHO_START;
|
|
1766
|
+ SERIAL_ECHOPGM(MSG_HOME " ");
|
|
1767
|
+ if (xx) SERIAL_ECHOPGM(MSG_X);
|
|
1768
|
+ if (yy) SERIAL_ECHOPGM(MSG_Y);
|
|
1769
|
+ if (zz) SERIAL_ECHOPGM(MSG_Z);
|
|
1770
|
+ SERIAL_ECHOLNPGM(" " MSG_FIRST);
|
|
1771
|
+
|
|
1772
|
+ #if ENABLED(ULTRA_LCD)
|
|
1773
|
+ char message[3 * (LCD_WIDTH) + 1] = ""; // worst case is kana.utf with up to 3*LCD_WIDTH+1
|
|
1774
|
+ strcat_P(message, PSTR(MSG_HOME " "));
|
|
1775
|
+ if (xx) strcat_P(message, PSTR(MSG_X));
|
|
1776
|
+ if (yy) strcat_P(message, PSTR(MSG_Y));
|
|
1777
|
+ if (zz) strcat_P(message, PSTR(MSG_Z));
|
|
1778
|
+ strcat_P(message, PSTR(" " MSG_FIRST));
|
|
1779
|
+ lcd_setstatus(message);
|
|
1780
|
+ #endif
|
|
1781
|
+ return true;
|
|
1782
|
+ }
|
|
1783
|
+ return false;
|
1785
|
1784
|
}
|
1786
|
|
- return false;
|
1787
|
|
-}
|
|
1785
|
+#endif
|
1788
|
1786
|
|
1789
|
1787
|
#if ENABLED(Z_PROBE_SLED)
|
1790
|
1788
|
|