From dc5c942d71a9006c824a1a0e8b6584eb2ce79bfe Mon Sep 17 00:00:00 2001 From: Monkeydave <1016013+monkeydave@users.noreply.github.com> Date: Thu, 5 Sep 2024 01:19:39 +0100 Subject: [PATCH 1/5] Fix Stow Z-Probe blocking future status messages after stowing --- Marlin/src/module/probe.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index dc40a8ecd788..ccfdb494ee4a 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -381,7 +381,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) { #endif TERN_(HAS_RESUME_CONTINUE, wait_for_user_response()); - ui.reset_status(); + ui.reset_alert_level(); #endif // PAUSE_BEFORE_DEPLOY_STOW From 77824af39c433539ede18fc5f7e9807853f17db2 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 5 Sep 2024 19:06:06 -0500 Subject: [PATCH 2/5] Fix underlying bug --- Marlin/src/lcd/marlinui.cpp | 2 -- Marlin/src/module/probe.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index d618440cb208..3cb01ea468b0 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -1490,8 +1490,6 @@ void MarlinUI::host_notify(const char * const cstr) { else if (ENABLED(STATUS_DO_CLEAR_EMPTY)) msg = F(""); - else - return; set_min_status(msg); } diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index ccfdb494ee4a..94cdc005db61 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -356,7 +356,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) { FSTR_P const ds_fstr = deploy ? GET_TEXT_F(MSG_MANUAL_DEPLOY) : GET_TEXT_F(MSG_MANUAL_STOW); ui.return_to_status(); // To display the new status message - ui.set_max_status(ds_fstr); + ui.set_max_status(ds_fstr); // Set a status message that won't be overwritten by the host SERIAL_ECHOLN(deploy ? GET_EN_TEXT_F(MSG_MANUAL_DEPLOY) : GET_EN_TEXT_F(MSG_MANUAL_STOW)); OKAY_BUZZ(); @@ -381,7 +381,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) { #endif TERN_(HAS_RESUME_CONTINUE, wait_for_user_response()); - ui.reset_alert_level(); + ui.reset_status(); #endif // PAUSE_BEFORE_DEPLOY_STOW From 90ebb960c40f40be3b503bb2cb737a5a796835c4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 5 Sep 2024 19:06:26 -0500 Subject: [PATCH 3/5] also --- Marlin/src/gcode/bedlevel/abl/G29.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp index 6ff09b3a7a23..9e85b731e136 100644 --- a/Marlin/src/gcode/bedlevel/abl/G29.cpp +++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp @@ -812,7 +812,7 @@ G29_TYPE GcodeSuite::G29() { #endif // AUTO_BED_LEVELING_3POINT - TERN_(HAS_STATUS_MESSAGE, ui.reset_status()); + ui.reset_status(); // Stow the probe. No raise for FIX_MOUNTED_PROBE. if (probe.stow()) { From e424fdf36ce399d04b7f4c83e566e81f5e01e7cc Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 8 Sep 2024 20:40:41 -0500 Subject: [PATCH 4/5] all the levels --- Marlin/src/module/probe.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index 94cdc005db61..5e0fb652944f 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -381,7 +381,8 @@ FORCE_INLINE void probe_specific_action(const bool deploy) { #endif TERN_(HAS_RESUME_CONTINUE, wait_for_user_response()); - ui.reset_status(); + ui.reset_alert_level(); + //ui.reset_status(); #endif // PAUSE_BEFORE_DEPLOY_STOW From f0b0ba435911ebaa178a5b02e1e1544244c55666 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 8 Sep 2024 20:44:27 -0500 Subject: [PATCH 5/5] fix underlying underlying bug --- Marlin/src/lcd/marlinui.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index 3cb01ea468b0..d618440cb208 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -1490,6 +1490,8 @@ void MarlinUI::host_notify(const char * const cstr) { else if (ENABLED(STATUS_DO_CLEAR_EMPTY)) msg = F(""); + else + return; set_min_status(msg); }