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

STM32F1 SD EEPROM Emulation Fixes (#14261)

Browse Source
This commit is contained in:
Phr3d13
2019-06-29 02:34:54 -04:00
committed by Scott Lahteine
parent e6cf7860e8
commit 34c8204d25
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@
#include "../module/printcounter.h"
#include "../core/language.h"
#include "../gcode/queue.h"
#include "../module/configuration_store.h"
#if ENABLED(EMERGENCY_PARSER)
#include "../feature/emergency_parser.h"
@ -352,6 +353,9 @@ 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();
@ -557,6 +561,11 @@ 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