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

Set LCD status for EEPROM errors (#16977)

Browse Source
This commit is contained in:
InsanityAutomation
2020-02-26 04:04:02 -05:00
committed by GitHub
parent e78f607ef3
commit cdcd45d651
5 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/lcd/language/language_en.h
View File

@ -314,6 +314,9 @@ namespace Language_en {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Load Settings");
PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Restore Defaults");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Initialize EEPROM");
PROGMEM Language_Str MSG_ERR_EEPROM_CRC = _UxGT("Err: EEPROM CRC");
PROGMEM Language_Str MSG_ERR_EEPROM_INDEX = _UxGT("Err: EEPROM Index");
PROGMEM Language_Str MSG_ERR_EEPROM_VERSION = _UxGT("Err: EEPROM Version");
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Media Update");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Reset Printer");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Refresh");

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

@ -1453,7 +1453,7 @@ void MarlinUI::update() {
/**
* Reset the status message
*/
void MarlinUI::reset_status() {
void MarlinUI::reset_status(const bool no_welcome) {
PGM_P printing = GET_TEXT(MSG_PRINTING);
PGM_P welcome = GET_TEXT(WELCOME_MSG);
#if SERVICE_INTERVAL_1 > 0
@ -1485,8 +1485,10 @@ void MarlinUI::update() {
else if (print_job_timer.needsService(3)) msg = service3;
#endif
else
else if (!no_welcome)
msg = welcome;
else
return;
set_status_P(msg, -1);
}

4
Marlin/src/lcd/ultralcd.h
View File

@ -402,7 +402,7 @@ public:
static void set_status(const char* const message, const bool persist=false);
static void set_status_P(PGM_P const message, const int8_t level=0);
static void status_printf_P(const uint8_t level, PGM_P const fmt, ...);
static void reset_status();
static void reset_status(const bool no_welcome=false);
#else // No LCD
@ -416,7 +416,7 @@ public:
static inline void refresh() {}
static inline void return_to_status() {}
static inline void set_alert_status_P(PGM_P const) {}
static inline void reset_status() {}
static inline void reset_status(const bool=false) {}
static inline void reset_alert_level() {}
static constexpr bool has_status() { return false; }