From 7634ffe8e569bd3e1d315cdbc675f90d6a803623 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 9 Sep 2024 04:29:35 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=9A=B8=20Fix=20alert=20level=20after?= =?UTF-8?q?=20Stow=20Z-Probe=20(#27404)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/gcode/bedlevel/abl/G29.cpp | 2 +- Marlin/src/module/probe.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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()) { diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index dc40a8ecd788..5e0fb652944f 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,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 b94a0d036c843b59488a4de77c1de8cf6e9e5863 Mon Sep 17 00:00:00 2001 From: thinkyhead Date: Mon, 9 Sep 2024 06:08:58 +0000 Subject: [PATCH 2/2] [cron] Bump distribution date (2024-09-09) --- Marlin/Version.h | 2 +- Marlin/src/inc/Version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index ec36fba917db..07fc8b1bf876 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-09-08" +//#define STRING_DISTRIBUTION_DATE "2024-09-09" /** * Defines a generic printer name to be output to the LCD after booting Marlin. diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index be5ad47463cd..c060a15cbccf 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2024-09-08" + #define STRING_DISTRIBUTION_DATE "2024-09-09" #endif /**