CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8181 from thinkyhead/bf2_fix_bootscreen_repeat

Browse Source 
[2.0.x] Only show custom bootscreen once
This commit is contained in:
Scott Lahteine 2017-10-31 02:37:40 -05:00 committed by GitHub
commit cae8703e0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/lcd/ultralcd_impl_DOGM.h
View File

@ -278,6 +278,8 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
bool show_bootscreen = true;
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN) #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
void lcd_custom_bootscreen() { void lcd_custom_bootscreen() {
@ -294,8 +296,6 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
void lcd_bootscreen() { void lcd_bootscreen() {
static bool show_bootscreen = true;
if (show_bootscreen) { if (show_bootscreen) {
show_bootscreen = false; show_bootscreen = false;
@ -353,11 +353,13 @@ static void lcd_implementation_init() {
#endif #endif
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN) if (show_bootscreen) {
lcd_custom_bootscreen(); #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
#else lcd_custom_bootscreen();
lcd_bootscreen(); #else
#endif lcd_bootscreen();
#endif
}
#endif #endif
} }