Revert "Sort out settings.load with SD EEPROM emulation (#14458)"

This reverts commit 108d0df565.
This commit is contained in:
Scott Lahteine
2019-07-03 19:11:30 -05:00
parent b7573c6e69
commit de462f2b8a
6 changed files with 15 additions and 31 deletions

View File

@ -941,9 +941,7 @@ void setup() {
// Load data from EEPROM if available (or use defaults)
// This also updates variables in the planner, elsewhere
#if DISABLED(SD_EEPROM_EMULATION)
(void)settings.load();
#endif
(void)settings.load();
#if HAS_M206_COMMAND
// Initialize current position based on home_offset
@ -1096,17 +1094,8 @@ void setup() {
init_closedloop();
#endif
#if !HAS_SPI_LCD
#if ENABLED(SD_EEPROM_EMULATION)
SERIAL_ECHOLNPGM("Loading settings from SD");
(void)settings.load();
#endif
#if ENABLED(INIT_SDCARD_ON_BOOT)
card.beginautostart();
#endif
#if ENABLED(INIT_SDCARD_ON_BOOT) && !HAS_SPI_LCD
card.beginautostart();
#endif
#if HAS_TRINAMIC && DISABLED(PS_DEFAULT_OFF)