MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor cleanup of lcd_goto_screen calls

Browse Source
This commit is contained in:
Scott Lahteine 2016-08-06 16:24:26 -07:00
parent e47c8b9829
commit a6d2c2479f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/ultralcd.cpp
View File

@ -484,15 +484,15 @@ static void lcd_status_screen() {
} }
if (current_click) { if (current_click) {
lcd_goto_screen(lcd_main_menu, true); #if ENABLED(FILAMENT_LCD_DISPLAY)
previous_lcd_status_ms = millis(); // get status message to show up for a while
#endif
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it. lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
false false
#endif #endif
); );
#if ENABLED(FILAMENT_LCD_DISPLAY) lcd_goto_screen(lcd_main_menu, true);
previous_lcd_status_ms = millis(); // get status message to show up for a while
#endif
} }
#if ENABLED(ULTIPANEL_FEEDMULTIPLY) #if ENABLED(ULTIPANEL_FEEDMULTIPLY)
@ -2091,7 +2091,6 @@ void kill_screen(const char* lcd_msg) {
static void lcd_filament_change_resume_print() { static void lcd_filament_change_resume_print() {
filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT; filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT;
lcdDrawUpdate = 2;
lcd_goto_screen(lcd_status_screen); lcd_goto_screen(lcd_status_screen);
} }