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

Better EEPROM alert message

Browse Source
This commit is contained in:
Scott Lahteine 2020-05-10 00:37:19 -05:00
parent 52aa459a2d
commit 71b41c963b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,7 +402,11 @@ bool MarlinUI::update_selection() {
return selection; return selection;
} }
void MenuItem_confirm::select_screen(PGM_P const yes, PGM_P const no, selectFunc_t yesFunc, selectFunc_t noFunc, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) { void MenuItem_confirm::select_screen(
PGM_P const yes, PGM_P const no,
selectFunc_t yesFunc, selectFunc_t noFunc,
PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/
) {
const bool ui_selection = ui.update_selection(), got_click = ui.use_click(); const bool ui_selection = ui.update_selection(), got_click = ui.use_click();
if (got_click || ui.should_draw()) { if (got_click || ui.should_draw()) {
draw_select_screen(yes, no, ui_selection, pref, string, suff); draw_select_screen(yes, no, ui_selection, pref, string, suff);

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

@ -1540,7 +1540,7 @@ void MarlinUI::update() {
#if HAS_LCD_MENU #if HAS_LCD_MENU
editable.uint8 = msgid; editable.uint8 = msgid;
goto_screen([]{ goto_screen([]{
PGM_P const restore_msg = GET_TEXT(MSG_RESTORE_DEFAULTS); PGM_P const restore_msg = GET_TEXT(MSG_INIT_EEPROM);
char msg[utf8_strlen_P(restore_msg) + 1]; char msg[utf8_strlen_P(restore_msg) + 1];
strcpy_P(msg, restore_msg); strcpy_P(msg, restore_msg);
MenuItem_confirm::select_screen( MenuItem_confirm::select_screen(