Merge pull request #8182 from thinkyhead/bf1_fix_bootscreen_repeat

[1.1.x] Only show custom bootscreen once
master
Scott Lahteine 7 years ago committed by GitHub
commit b48a77c88a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -277,6 +277,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() {
@ -293,8 +295,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;
@ -352,11 +352,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
} }

Loading…
Cancel
Save