From 13a3fb1accec51adb12f7af4f45d6d63f4bc8a3f Mon Sep 17 00:00:00 2001
From: AnHardt <github@kitelab.de>
Date: Fri, 3 Nov 2017 11:58:20 +0100
Subject: [PATCH] Some cleanup around 'lcd_bootscreen()' and
'lcd_kill_screen()'
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.
---
Marlin/Marlin_main.cpp | 18 ++-------
Marlin/ultralcd.cpp | 9 +----
Marlin/ultralcd_impl_DOGM.h | 79 ++++++++++++++++++-------------------
3 files changed, 42 insertions(+), 64 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 7fb5e372f4..41361922df 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -13911,22 +13911,10 @@ void setup() {
lcd_init();
- #ifndef CUSTOM_BOOTSCREEN_TIMEOUT
- #define CUSTOM_BOOTSCREEN_TIMEOUT 2500
- #endif
-
#if ENABLED(SHOW_BOOTSCREEN)
- #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)
- lcd_bootscreen();
- #if DISABLED(SDSUPPORT)
- lcd_init();
- #endif
+ lcd_bootscreen();
+ #if ENABLED(ULTRA_LCD) && DISABLED(SDSUPPORT)
+ lcd_init();
#endif
#endif
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 9a11535bee..4360dc123b 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -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)
diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h
index 5eee41e002..1ecd91188e 100644
--- a/Marlin/ultralcd_impl_DOGM.h
+++ b/Marlin/ultralcd_impl_DOGM.h
@@ -277,10 +277,12 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
#if ENABLED(SHOW_BOOTSCREEN)
- bool show_bootscreen = true;
-
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
+ #ifndef CUSTOM_BOOTSCREEN_TIMEOUT
+ #define CUSTOM_BOOTSCREEN_TIMEOUT 2500
+ #endif
+
void lcd_custom_bootscreen() {
u8g.firstPage();
do {
@@ -289,37 +291,38 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
( 64 - (CUSTOM_BOOTSCREEN_BMPHEIGHT)) /2,
CEILING(CUSTOM_BOOTSCREEN_BMPWIDTH, 8), CUSTOM_BOOTSCREEN_BMPHEIGHT, custom_start_bmp);
} while (u8g.nextPage());
+ safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT);
}
#endif // SHOW_CUSTOM_BOOTSCREEN
void lcd_bootscreen() {
+ #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
+ lcd_custom_bootscreen();
+ #endif
- if (show_bootscreen) {
- show_bootscreen = false;
+ #if ENABLED(START_BMPHIGH)
+ constexpr uint8_t offy = 0;
+ #else
+ constexpr uint8_t offy = DOG_CHAR_HEIGHT;
+ #endif
- #if ENABLED(START_BMPHIGH)
- constexpr uint8_t offy = 0;
+ const uint8_t offx = (u8g.getWidth() - (START_BMPWIDTH)) / 2,
+ txt1X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE1) - 1) * (DOG_CHAR_WIDTH)) / 2;
+
+ u8g.firstPage();
+ do {
+ u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
+ lcd_setFont(FONT_MENU);
+ #ifndef STRING_SPLASH_LINE2
+ u8g.drawStr(txt1X, u8g.getHeight() - (DOG_CHAR_HEIGHT), STRING_SPLASH_LINE1);
#else
- constexpr uint8_t offy = DOG_CHAR_HEIGHT;
+ const uint8_t txt2X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE2) - 1) * (DOG_CHAR_WIDTH)) / 2;
+ u8g.drawStr(txt1X, u8g.getHeight() - (DOG_CHAR_HEIGHT) * 3 / 2, STRING_SPLASH_LINE1);
+ u8g.drawStr(txt2X, u8g.getHeight() - (DOG_CHAR_HEIGHT) * 1 / 2, STRING_SPLASH_LINE2);
#endif
-
- const uint8_t offx = (u8g.getWidth() - (START_BMPWIDTH)) / 2,
- txt1X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE1) - 1) * (DOG_CHAR_WIDTH)) / 2;
-
- u8g.firstPage();
- do {
- u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
- lcd_setFont(FONT_MENU);
- #ifndef STRING_SPLASH_LINE2
- u8g.drawStr(txt1X, u8g.getHeight() - (DOG_CHAR_HEIGHT), STRING_SPLASH_LINE1);
- #else
- const uint8_t txt2X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE2) - 1) * (DOG_CHAR_WIDTH)) / 2;
- u8g.drawStr(txt1X, u8g.getHeight() - (DOG_CHAR_HEIGHT) * 3 / 2, STRING_SPLASH_LINE1);
- u8g.drawStr(txt2X, u8g.getHeight() - (DOG_CHAR_HEIGHT) * 1 / 2, STRING_SPLASH_LINE2);
- #endif
- } while (u8g.nextPage());
- }
+ } while (u8g.nextPage());
+ safe_delay(BOOTSCREEN_TIMEOUT);
}
#endif // SHOW_BOOTSCREEN
@@ -350,27 +353,20 @@ static void lcd_implementation_init() {
#elif ENABLED(LCD_SCREEN_ROT_270)
u8g.setRot270(); // Rotate screen by 270°
#endif
-
- #if ENABLED(SHOW_BOOTSCREEN)
- if (show_bootscreen) {
- #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
- lcd_custom_bootscreen();
- #else
- lcd_bootscreen();
- #endif
- }
- #endif
}
// The kill screen is displayed for unrecoverable conditions
void lcd_kill_screen() {
- lcd_setFont(FONT_MENU);
- u8g.setPrintPos(0, u8g.getHeight()/4*1);
- lcd_print_utf(lcd_status_message);
- u8g.setPrintPos(0, u8g.getHeight()/4*2);
- lcd_printPGM(PSTR(MSG_HALTED));
- u8g.setPrintPos(0, u8g.getHeight()/4*3);
- lcd_printPGM(PSTR(MSG_PLEASE_RESET));
+ u8g.firstPage();
+ do {
+ lcd_setFont(FONT_MENU);
+ u8g.setPrintPos(0, u8g.getHeight()/4*1);
+ lcd_print_utf(lcd_status_message);
+ u8g.setPrintPos(0, u8g.getHeight()/4*2);
+ lcd_printPGM(PSTR(MSG_HALTED));
+ u8g.setPrintPos(0, u8g.getHeight()/4*3);
+ lcd_printPGM(PSTR(MSG_PLEASE_RESET));
+ } while (u8g.nextPage());
}
void lcd_implementation_clear() { } // Automatically cleared by Picture Loop
@@ -476,6 +472,7 @@ inline void lcd_implementation_status_message(const bool blink) {
}
}
#else
+ UNUSED(blink);
lcd_print_utf(lcd_status_message);
#endif
}