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

🎨 Apply F() to kill / sendinfoscreen

Browse Source
This commit is contained in:
Scott Lahteine
2021-09-28 20:15:52 -05:00
parent 492d70424d
commit 3d102a77ca
52 changed files with 149 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
View File

@ -159,9 +159,9 @@ void DGUSScreenHandler::Loop() {
dgus_display.Loop();
}
void DGUSScreenHandler::PrinterKilled(PGM_P error, PGM_P component) {
SetMessageLinePGM(error, 1);
SetMessageLinePGM(component, 2);
void DGUSScreenHandler::PrinterKilled(FSTR_P const error, FSTR_P const component) {
SetMessageLinePGM(FTOP(error), 1);
SetMessageLinePGM(FTOP(component), 2);
SetMessageLinePGM(NUL_STR, 3);
SetMessageLinePGM(GET_TEXT(MSG_PLEASE_RESET), 4);

2
Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
View File

@ -37,7 +37,7 @@ public:
static void Ready();
static void Loop();
static void PrinterKilled(PGM_P error, PGM_P component);
static void PrinterKilled(FSTR_P const error, FSTR_P const component);
static void UserConfirmRequired(const char * const msg);
static void SettingsReset();
static void StoreSettings(char *buff);

2
Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
View File

@ -46,7 +46,7 @@ namespace ExtUI {
}
}
void onPrinterKilled(PGM_P error, PGM_P component) {
void onPrinterKilled(FSTR_P const error, FSTR_P const component) {
dgus_screen_handler.PrinterKilled(error, component);
}