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

8
Marlin/src/sd/cardreader.cpp
View File

@ -353,9 +353,6 @@ void CardReader::initsd() {
else {
flag.detected = true;
SERIAL_ECHO_MSG(MSG_SD_CARD_OK);
#if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
(void)settings.load();
#endif
}
setroot();
@ -561,11 +558,6 @@ void CardReader::checkautostart() {
if (!isDetected()) initsd();
#if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
SERIAL_ECHOLNPGM("Loading settings from SD");
(void)settings.load();
#endif
if (isDetected()
#if ENABLED(POWER_LOSS_RECOVERY)
&& !recovery.valid() // Don't run auto#.g when a resume file exists