bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🚸 Clear "heating/cooling" message on temp reached

Browse Source
This commit is contained in:
Scott Lahteine
2022-03-25 17:35:00 -05:00
committed by Scott Lahteine
parent 9324132a40
commit 0e693854d0
6 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/marlinui.cpp
View File

@ -73,6 +73,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
#endif
char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
uint8_t MarlinUI::alert_level; // = 0
statusResetFunc_t MarlinUI::status_reset_callback; // = nullptr
#endif
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
@ -627,6 +628,9 @@ void MarlinUI::init() {
#endif // BASIC_PROGRESS_BAR
if (status_reset_callback && (*status_reset_callback)())
reset_status();
#if HAS_MARLINUI_MENU
if (use_click()) {
#if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
@ -1515,6 +1519,8 @@ void MarlinUI::init() {
UNUSED(persist);
set_status_reset_fn();
#if HAS_WIRED_LCD
#if BASIC_PROGRESS_BAR || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)

6
Marlin/src/lcd/marlinui.h
View File

@ -59,6 +59,8 @@
#define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80U)
typedef bool (*statusResetFunc_t)();
#if HAS_WIRED_LCD
enum LCDViewAction : uint8_t {
@ -352,11 +354,15 @@ public:
static void reset_status(const bool no_welcome=false);
static void set_alert_status(FSTR_P const fstr);
static void reset_alert_level() { alert_level = 0; }
static statusResetFunc_t status_reset_callback;
static void set_status_reset_fn(const statusResetFunc_t fn=nullptr) { status_reset_callback = fn; }
#else
static constexpr bool has_status() { return false; }
static void reset_status(const bool=false) {}
static void set_alert_status(FSTR_P const) {}
static void reset_alert_level() {}
static void set_status_reset_fn(const statusResetFunc_t=nullptr) {}
#endif
static void set_status(const char * const cstr, const bool persist=false);