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

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

Browse Source
This commit is contained in:
Tanguy Pruvot
2019-07-01 16:10:17 +02:00
committed by Scott Lahteine
parent c9be936d4a
commit 108d0df565
6 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/src/lcd/ultralcd.cpp
View File

@ -81,6 +81,10 @@
#include "../Marlin.h"
#if ENABLED(SD_EEPROM_EMULATION)
#include "../module/configuration_store.h"
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
#include "../feature/power_loss_recovery.h"
#endif
@ -783,8 +787,13 @@ void MarlinUI::update() {
if (sd_status) {
safe_delay(500); // Some boards need a delay to get settled
card.initsd();
if (old_sd_status == 2)
if (old_sd_status == 2) {
#if ENABLED(SD_EEPROM_EMULATION)
SERIAL_ECHOLNPGM("Loading settings from SD");
(void)settings.load();
#endif
card.beginautostart(); // Initial boot
}
else
set_status_P(PSTR(MSG_SD_INSERTED));
}