0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix up boot screen code

Browse source 
Followup to #15125

Co-Authored-By: Ludy <ludy87@users.noreply.github.com>
This commit is contained in:
Scott Lahteine 2019-09-04 14:34:27 -05:00
parent 6b05d5d65d
commit 7ad5208267
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
View file

@ -159,9 +159,13 @@ bool MarlinUI::detected() { return true; }
} }
#endif // SHOW_CUSTOM_BOOTSCREEN #endif // SHOW_CUSTOM_BOOTSCREEN
// Two-part needed to display all info
constexpr bool two_part = ((LCD_PIXEL_HEIGHT) - (START_BMPHEIGHT)) < ((MENU_FONT_ASCENT) * 2);
// Draw the static Marlin bootscreen from a u8g loop // Draw the static Marlin bootscreen from a u8g loop
// or the animated boot screen within its own u8g loop // or the animated boot screen within its own u8g loop
void MarlinUI::draw_marlin_bootscreen(const bool line2/*=false*/) { void MarlinUI::draw_marlin_bootscreen(const bool line2/*=false*/) {
// Determine text space needed // Determine text space needed
constexpr u8g_uint_t text_width_1 = u8g_uint_t((sizeof(SHORT_BUILD_VERSION) - 1) * (MENU_FONT_WIDTH)), constexpr u8g_uint_t text_width_1 = u8g_uint_t((sizeof(SHORT_BUILD_VERSION) - 1) * (MENU_FONT_WIDTH)),
text_width_2 = u8g_uint_t((sizeof(MARLIN_WEBSITE_URL) - 1) * (MENU_FONT_WIDTH)), text_width_2 = u8g_uint_t((sizeof(MARLIN_WEBSITE_URL) - 1) * (MENU_FONT_WIDTH)),
@ -169,7 +173,6 @@ bool MarlinUI::detected() { return true; }
text_total_height = (MENU_FONT_HEIGHT) * 2, text_total_height = (MENU_FONT_HEIGHT) * 2,
width = LCD_PIXEL_WIDTH, height = LCD_PIXEL_HEIGHT, width = LCD_PIXEL_WIDTH, height = LCD_PIXEL_HEIGHT,
rspace = width - (START_BMPWIDTH); rspace = width - (START_BMPWIDTH);
constexpr bool two_part = (height - (START_BMPHEIGHT)) < ((MENU_FONT_ASCENT) * 2);
u8g_int_t offx, offy, txt_base, txt_offx_1, txt_offx_2; u8g_int_t offx, offy, txt_base, txt_offx_1, txt_offx_2;
@ -192,41 +195,38 @@ bool MarlinUI::detected() { return true; }
NOLESS(offx, 0); NOLESS(offx, 0);
NOLESS(offy, 0); NOLESS(offy, 0);
auto draw_bootscreen_bmp = [&](const uint8_t *bitmap) { auto _draw_bootscreen_bmp = [&](const uint8_t *bitmap) {
u8g.drawBitmapP(offx, offy, START_BMP_BYTEWIDTH, START_BMPHEIGHT, bitmap); u8g.drawBitmapP(offx, offy, START_BMP_BYTEWIDTH, START_BMPHEIGHT, bitmap);
set_font(FONT_MENU); set_font(FONT_MENU);
if (!two_part || !line2) lcd_put_u8str_P(txt_offx_1, txt_base - (MENU_FONT_HEIGHT), PSTR(SHORT_BUILD_VERSION)); if (!two_part || !line2) lcd_put_u8str_P(txt_offx_1, txt_base - (MENU_FONT_HEIGHT), PSTR(SHORT_BUILD_VERSION));
if (!two_part || line2) lcd_put_u8str_P(txt_offx_2, txt_base, PSTR(MARLIN_WEBSITE_URL)); if (!two_part || line2) lcd_put_u8str_P(txt_offx_2, txt_base, PSTR(MARLIN_WEBSITE_URL));
}; };
auto draw_bootscreen_bmp = [&](const uint8_t *bitmap) {
u8g.firstPage(); do { _draw_bootscreen_bmp(bitmap); } while (u8g.nextPage());
};
#if DISABLED(BOOT_MARLIN_LOGO_ANIMATED) #if DISABLED(BOOT_MARLIN_LOGO_ANIMATED)
draw_bootscreen_bmp(start_bmp); draw_bootscreen_bmp(start_bmp);
#else #else
constexpr millis_t d = MARLIN_BOOTSCREEN_FRAME_TIME; constexpr millis_t d = MARLIN_BOOTSCREEN_FRAME_TIME;
LOOP_L_N(f, COUNT(marlin_bootscreen_animation)) { LOOP_L_N(f, COUNT(marlin_bootscreen_animation)) {
u8g.firstPage();
do {
const u8g_pgm_uint8_t * const bmp = (u8g_pgm_uint8_t*)pgm_read_ptr(&marlin_bootscreen_animation[f]); const u8g_pgm_uint8_t * const bmp = (u8g_pgm_uint8_t*)pgm_read_ptr(&marlin_bootscreen_animation[f]);
draw_bootscreen_bmp(bmp); draw_bootscreen_bmp(bmp);
} while (u8g.nextPage());
if (d) safe_delay(d); if (d) safe_delay(d);
} }
#endif #endif
} }
// Shows the Marlin bootscreen, with the u8g loop and delays // Show the Marlin bootscreen, with the u8g loop and delays
void MarlinUI::show_marlin_bootscreen() { void MarlinUI::show_marlin_bootscreen() {
#ifndef BOOTSCREEN_TIMEOUT #ifndef BOOTSCREEN_TIMEOUT
#define BOOTSCREEN_TIMEOUT 2500 #define BOOTSCREEN_TIMEOUT 2500
#endif #endif
for (uint8_t q = 2; q--;) { constexpr uint8_t pages = two_part ? 2 : 1;
#if DISABLED(BOOT_MARLIN_LOGO_ANIMATED) for (uint8_t q = pages; q--;) {
u8g.firstPage();
do { draw_marlin_bootscreen(q == 0); } while (u8g.nextPage());
#else
draw_marlin_bootscreen(q == 0); draw_marlin_bootscreen(q == 0);
#endif safe_delay((BOOTSCREEN_TIMEOUT) / pages);
safe_delay((BOOTSCREEN_TIMEOUT) / 2);
} }
} }