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

Some cleanup around 'lcd_bootscreen()' and 'lcd_kill_screen()'

Browse Source 
Move 'lcd_bootscreen()' from `lcd_init()` to 'setup()' where it is cexecute exactly once. Saves 'bool show_bootscreen'.
Move the call of 'lcd_custom_bootscreen()' to the begin of 'lcd_bootscreen()'.
Move the delays into the related functions.
Move the picture loop around 'lcd_kill_screen()' into the function.
This commit is contained in:
AnHardt
2017-11-03 11:58:20 +01:00
parent 84b93d941f
commit ca0e4b4e96
3 changed files with 41 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -715,14 +715,7 @@ void lcd_reset_status() { lcd_setstatusPGM(PSTR(""), -1); }
void kill_screen(const char* lcd_msg) {
lcd_init();
lcd_setalertstatusPGM(lcd_msg);
#if ENABLED(DOGLCD)
u8g.firstPage();
do {
lcd_kill_screen();
} while (u8g.nextPage());
#else
lcd_kill_screen();
#endif
lcd_kill_screen();
}
#if ENABLED(ULTIPANEL)