From f32122aa6935a32450d4d0758e58ee5637203203 Mon Sep 17 00:00:00 2001 From: Dennis Lawler Date: Thu, 13 Apr 2023 13:52:07 -0600 Subject: [PATCH 1/2] Serial echo on Zprobe out-of-bounds --- Marlin/src/gcode/probe/G30.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp index a17ec367df72..db0c71582753 100644 --- a/Marlin/src/gcode/probe/G30.cpp +++ b/Marlin/src/gcode/probe/G30.cpp @@ -105,8 +105,8 @@ void GcodeSuite::G30() { report_current_position(); } else { + SERIAL_ECHOLNF(GET_EN_TEXT_F(MSG_ZPROBE_OUT)); #if ENABLED(DWIN_LCD_PROUI) - SERIAL_ECHOLNF(GET_EN_TEXT_F(MSG_ZPROBE_OUT)); LCD_MESSAGE(MSG_ZPROBE_OUT); #endif } From f0d1abdadd8be05689b8de89cbe11f332bc8eb1c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 13 Apr 2023 23:17:47 -0500 Subject: [PATCH 2/2] All LCDs with status --- Marlin/src/gcode/probe/G30.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp index db0c71582753..468189bf5acc 100644 --- a/Marlin/src/gcode/probe/G30.cpp +++ b/Marlin/src/gcode/probe/G30.cpp @@ -28,6 +28,7 @@ #include "../../module/motion.h" #include "../../module/probe.h" #include "../../feature/bedlevel/bedlevel.h" +#include "../../lcd/marlinui.h" #if HAS_PTC #include "../../feature/probe_temp_comp.h" @@ -37,10 +38,6 @@ #include "../../module/tool_change.h" #endif -#if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) - #include "../../lcd/marlinui.h" -#endif - /** * G30: Do a single Z probe at the given XY (default: current) * @@ -106,9 +103,7 @@ void GcodeSuite::G30() { } else { SERIAL_ECHOLNF(GET_EN_TEXT_F(MSG_ZPROBE_OUT)); - #if ENABLED(DWIN_LCD_PROUI) - LCD_MESSAGE(MSG_ZPROBE_OUT); - #endif + LCD_MESSAGE(MSG_ZPROBE_OUT); } probe.use_probing_tool(false);