3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make lcd_bootscreen common to both

Browse source
This commit is contained in:
Scott Lahteine 2017-07-02 00:35:41 -05:00
parent 859248433f
commit ae5923a3d0
4 changed files with 65 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Marlin/Marlin_main.cpp
View file

@ -13034,11 +13034,16 @@ void setup() {
#endif
lcd_init();
#if ENABLED(SHOW_BOOTSCREEN)
#if ENABLED(DOGLCD)
safe_delay(BOOTSCREEN_TIMEOUT);
#if ENABLED(DOGLCD) // On DOGM the first bootscreen is already drawn
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT); // Custom boot screen pause
lcd_bootscreen(); // Show Marlin boot screen
#endif
safe_delay(BOOTSCREEN_TIMEOUT); // Pause
#elif ENABLED(ULTRA_LCD)
bootscreen();
lcd_bootscreen();
#if DISABLED(SDSUPPORT)
lcd_init();
#endif