sv/Marlin
1
1
Fork 0
Code Issues Pull Requests Wiki Activity

Move last bootscreen delay to end of setup (#21665)

Browse Source
This commit is contained in:
Scott Lahteine
2021-04-24 01:29:30 -05:00
committed by GitHub
parent a73dce4a56
commit a29aefc9c0
9 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/src/MarlinCore.cpp
View File

@@ -1214,8 +1214,9 @@ void setup() {
DWIN_UpdateLCD(); // Show bootscreen (first image)
#else
SETUP_RUN(ui.init());
#if HAS_WIRED_LCD && ENABLED(SHOW_BOOTSCREEN)
#if BOTH(HAS_WIRED_LCD, SHOW_BOOTSCREEN)
SETUP_RUN(ui.show_bootscreen());
const millis_t bootscreen_ms = millis();
#endif
SETUP_RUN(ui.reset_status()); // Load welcome message early. (Retained if no errors exist.)
#endif
@@ -1501,6 +1502,14 @@ void setup() {
SETUP_RUN(tft_lvgl_init());
#endif
#if BOTH(HAS_WIRED_LCD, SHOW_BOOTSCREEN)
const millis_t elapsed = millis() - bootscreen_ms;
#if ENABLED(MARLIN_DEV_MODE)
SERIAL_ECHOLNPAIR("elapsed=", elapsed);
#endif
SETUP_RUN(ui.bootscreen_completion(elapsed));
#endif
#if ENABLED(PASSWORD_ON_STARTUP)
SETUP_RUN(password.lock_machine()); // Will not proceed until correct password provided
#endif