Clean up setup

This commit is contained in:
Scott Lahteine 2020-06-21 21:21:34 -05:00
parent f604560c63
commit d236b3dcf5

View file

@ -986,10 +986,6 @@ void setup() {
SETUP_RUN(ui.reset_status()); // Load welcome message early. (Retained if no errors exist.) SETUP_RUN(ui.reset_status()); // Load welcome message early. (Retained if no errors exist.)
#endif #endif
#if BOTH(HAS_SPI_LCD, SHOW_BOOTSCREEN)
SETUP_RUN(ui.show_bootscreen());
#endif
#if BOTH(SDSUPPORT, SDCARD_EEPROM_EMULATION) #if BOTH(SDSUPPORT, SDCARD_EEPROM_EMULATION)
SETUP_RUN(card.mount()); // Mount media with settings before first_load SETUP_RUN(card.mount()); // Mount media with settings before first_load
#endif #endif
@ -997,10 +993,6 @@ void setup() {
SETUP_RUN(settings.first_load()); // Load data from EEPROM if available (or use defaults) SETUP_RUN(settings.first_load()); // Load data from EEPROM if available (or use defaults)
// This also updates variables in the planner, elsewhere // This also updates variables in the planner, elsewhere
#if HAS_SERVICE_INTERVALS
SETUP_RUN(ui.reset_status(true)); // Show service messages or keep current status
#endif
#if ENABLED(TOUCH_BUTTONS) #if ENABLED(TOUCH_BUTTONS)
SETUP_RUN(touch.init()); SETUP_RUN(touch.init());
#endif #endif