From 5f368d1bc30c6542bc86f45e981330ed9ad6ead4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= <jbrazio@gmail.com>
Date: Sat, 16 Jul 2016 11:57:35 +0100
Subject: [PATCH] Followup for #4320
---
Marlin/Marlin_main.cpp | 52 ++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 27 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index d4c7846f24..5091c421c4 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -1706,10 +1706,6 @@ inline void do_blocking_move_to_z(float z, float feed_rate = 0.0) {
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z, feed_rate);
}
-inline void do_blocking_move_to_xy(float x, float y, float feed_rate = 0.0) {
- do_blocking_move_to(x, y, current_position[Z_AXIS], feed_rate);
-}
-
//
// Prepare to do endstop or probe moves
// with custom feedrates.
@@ -1760,31 +1756,33 @@ static void clean_up_after_endstop_or_probe_move() {
#endif //HAS_BED_PROBE
-static bool axis_unhomed_error(const bool x, const bool y, const bool z) {
- const bool xx = x && !axis_homed[X_AXIS],
- yy = y && !axis_homed[Y_AXIS],
- zz = z && !axis_homed[Z_AXIS];
- if (xx || yy || zz) {
- SERIAL_ECHO_START;
- SERIAL_ECHOPGM(MSG_HOME " ");
- if (xx) SERIAL_ECHOPGM(MSG_X);
- if (yy) SERIAL_ECHOPGM(MSG_Y);
- if (zz) SERIAL_ECHOPGM(MSG_Z);
- SERIAL_ECHOLNPGM(" " MSG_FIRST);
+#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)
+ static bool axis_unhomed_error(const bool x, const bool y, const bool z) {
+ const bool xx = x && !axis_homed[X_AXIS],
+ yy = y && !axis_homed[Y_AXIS],
+ zz = z && !axis_homed[Z_AXIS];
+ if (xx || yy || zz) {
+ SERIAL_ECHO_START;
+ SERIAL_ECHOPGM(MSG_HOME " ");
+ if (xx) SERIAL_ECHOPGM(MSG_X);
+ if (yy) SERIAL_ECHOPGM(MSG_Y);
+ if (zz) SERIAL_ECHOPGM(MSG_Z);
+ SERIAL_ECHOLNPGM(" " MSG_FIRST);
- #if ENABLED(ULTRA_LCD)
- char message[3 * (LCD_WIDTH) + 1] = ""; // worst case is kana.utf with up to 3*LCD_WIDTH+1
- strcat_P(message, PSTR(MSG_HOME " "));
- if (xx) strcat_P(message, PSTR(MSG_X));
- if (yy) strcat_P(message, PSTR(MSG_Y));
- if (zz) strcat_P(message, PSTR(MSG_Z));
- strcat_P(message, PSTR(" " MSG_FIRST));
- lcd_setstatus(message);
- #endif
- return true;
+ #if ENABLED(ULTRA_LCD)
+ char message[3 * (LCD_WIDTH) + 1] = ""; // worst case is kana.utf with up to 3*LCD_WIDTH+1
+ strcat_P(message, PSTR(MSG_HOME " "));
+ if (xx) strcat_P(message, PSTR(MSG_X));
+ if (yy) strcat_P(message, PSTR(MSG_Y));
+ if (zz) strcat_P(message, PSTR(MSG_Z));
+ strcat_P(message, PSTR(" " MSG_FIRST));
+ lcd_setstatus(message);
+ #endif
+ return true;
+ }
+ return false;
}
- return false;
-}
+#endif
#if ENABLED(Z_PROBE_SLED)