Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] bugfix-2.1.x from MarlinFirmware:bugfix-2.1.x #518

Merged
merged 2 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/bedlevel/abl/G29.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand Down
5 changes: 3 additions & 2 deletions Marlin/src/module/probe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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

Expand Down
Loading