bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Invariant Marlin bootscreen (#15057)

Browse Source
This commit is contained in:
Scott Lahteine
2019-08-28 07:40:18 -05:00
committed by GitHub
parent b2a4b6f34e
commit 3ac76f0489
127 changed files with 785 additions and 1065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
View File

@ -159,23 +159,17 @@ bool MarlinUI::detected() { return true; }
}
#endif // SHOW_CUSTOM_BOOTSCREEN
// Draws a slice of the Marlin bootscreen, without the u8g loop
void MarlinUI::draw_marlin_bootscreen() {
// Screen dimensions.
//const u8g_uint_t width = u8g.getWidth(), height = u8g.getHeight();
constexpr u8g_uint_t width = LCD_PIXEL_WIDTH, height = LCD_PIXEL_HEIGHT;
// Draw the static Marlin bootscreen from a u8g loop
// or the animated boot screen within its own u8g loop
void MarlinUI::draw_marlin_bootscreen(const bool line2/*=false*/) {
// Determine text space needed
#ifndef STRING_SPLASH_LINE2
constexpr u8g_uint_t text_total_height = MENU_FONT_HEIGHT,
text_width_2 = 0;
#else
constexpr u8g_uint_t text_total_height = (MENU_FONT_HEIGHT) * 2,
text_width_2 = u8g_uint_t((sizeof(STRING_SPLASH_LINE2) - 1) * (MENU_FONT_WIDTH));
#endif
constexpr u8g_uint_t text_width_1 = u8g_uint_t((sizeof(STRING_SPLASH_LINE1) - 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_max_width = _MAX(text_width_1, text_width_2),
text_total_height = (MENU_FONT_HEIGHT) * 2,
width = LCD_PIXEL_WIDTH, height = LCD_PIXEL_HEIGHT,
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;
@ -189,8 +183,8 @@ bool MarlinUI::detected() { return true; }
}
else {
constexpr int8_t inter = (height - text_total_height - (START_BMPHEIGHT)) / 3; // Evenly distribute vertical space
offy = inter; // V-align boot logo proportionally
offx = rspace / 2; // Center the boot logo in the whole space
offy = inter; // V-align boot logo proportionally
txt_offx_1 = (width - text_width_1) / 2; // Text 1 centered
txt_offx_2 = (width - text_width_2) / 2; // Text 2 centered
txt_base = offy + START_BMPHEIGHT + offy + text_total_height - (MENU_FONT_DESCENT); // Even spacing looks best
@ -201,12 +195,8 @@ bool MarlinUI::detected() { return true; }
auto draw_bootscreen_bmp = [&](const uint8_t *bitmap) {
u8g.drawBitmapP(offx, offy, START_BMP_BYTEWIDTH, START_BMPHEIGHT, bitmap);
set_font(FONT_MENU);
#ifndef STRING_SPLASH_LINE2
lcd_put_u8str_P(txt_offx_1, txt_base, PSTR(STRING_SPLASH_LINE1));
#else
lcd_put_u8str_P(txt_offx_1, txt_base - (MENU_FONT_HEIGHT), PSTR(STRING_SPLASH_LINE1));
lcd_put_u8str_P(txt_offx_2, txt_base, PSTR(STRING_SPLASH_LINE2));
#endif
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 DISABLED(BOOT_MARLIN_LOGO_ANIMATED)
@ -229,9 +219,15 @@ bool MarlinUI::detected() { return true; }
#ifndef BOOTSCREEN_TIMEOUT
#define BOOTSCREEN_TIMEOUT 2500
#endif
u8g.firstPage();
do { draw_marlin_bootscreen(); } while (u8g.nextPage());
safe_delay(BOOTSCREEN_TIMEOUT);
for (uint8_t q = 2; q--;) {
#if DISABLED(BOOT_MARLIN_LOGO_ANIMATED)
u8g.firstPage();
do { draw_marlin_bootscreen(q == 0); } while (u8g.nextPage());
#else
draw_marlin_bootscreen(q == 0);
#endif
safe_delay((BOOTSCREEN_TIMEOUT) / 2);
}
}
void MarlinUI::show_bootscreen() {