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

Include order, spacing, etc.

Browse Source
This commit is contained in:
Scott Lahteine
2019-06-23 03:43:36 -05:00
parent 1b1a4677f5
commit 3d9d72e8db
11 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/lcd/extui_dgus_lcd.cpp
View File

@ -41,13 +41,13 @@ namespace ExtUI {
ScreenHandler.UpdateScreenVPData();
}
void onIdle() { ScreenHandler.loop(); }
void onIdle() { ScreenHandler.loop(); }
void onPrinterKilled(const char* msg) {
ScreenHandler.sendinfoscreen(PSTR(MSG_HALTED), msg, PSTR(""), PSTR(MSG_PLEASE_RESET), true, true, true, true);
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL);
while (!ScreenHandler.loop()); // Wait while anything is left to be sent
}
void onPrinterKilled(const char* msg) {
ScreenHandler.sendinfoscreen(PSTR(MSG_HALTED), msg, PSTR(""), PSTR(MSG_PLEASE_RESET), true, true, true, true);
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL);
while (!ScreenHandler.loop()); // Wait while anything is left to be sent
}
void onMediaInserted() { ScreenHandler.SDCardInserted(); }
void onMediaError() { ScreenHandler.SDCardError(); }

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

@ -99,7 +99,7 @@ void MarlinUI::goto_previous_screen() {
/////////// Common Menu Actions ////////////
////////////////////////////////////////////
void MenuItem_gcode::action(PGM_P pgcode) { queue.inject_P(pgcode); }
void MenuItem_gcode::action(PGM_P const pgcode) { queue.inject_P(pgcode); }
////////////////////////////////////////////
/////////// Menu Editing Actions ///////////

2
Marlin/src/lcd/menu/menu_filament.cpp
View File

@ -512,7 +512,7 @@ FORCE_INLINE screenFunc_t ap_message_screen(const PauseMessage message) {
case PAUSE_MESSAGE_HEAT: return lcd_pause_heat_message;
case PAUSE_MESSAGE_HEATING: return lcd_pause_heating_message;
case PAUSE_MESSAGE_OPTION: pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
return menu_pause_option;
return menu_pause_option;
case PAUSE_MESSAGE_STATUS:
default: break;
}