CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/HAL/HAL_ESP32/persistent_store_spiffs.cpp
View File

@ -24,7 +24,7 @@
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#if ENABLED(SD_EEPROM_EMULATION) #if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
#include "../shared/persistent_store_api.h" #include "../shared/persistent_store_api.h"
@ -102,5 +102,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
size_t PersistentStore::capacity() { return HAL_ESP32_EEPROM_SIZE; } size_t PersistentStore::capacity() { return HAL_ESP32_EEPROM_SIZE; }
#endif // SD_EEPROM_EMULATION #endif // EEPROM_SETTINGS
#endif // ARDUINO_ARCH_ESP32 #endif // ARDUINO_ARCH_ESP32

2
Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
View File

@ -28,7 +28,7 @@
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#if ENABLED(SD_EEPROM_EMULATION) #if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
#include "../shared/persistent_store_api.h" #include "../shared/persistent_store_api.h"

17
Marlin/src/Marlin.cpp
View File

@ -941,9 +941,7 @@ void setup() {
// Load data from EEPROM if available (or use defaults) // 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 DISABLED(SD_EEPROM_EMULATION) (void)settings.load();
(void)settings.load();
#endif
#if HAS_M206_COMMAND #if HAS_M206_COMMAND
// Initialize current position based on home_offset // Initialize current position based on home_offset
@ -1096,17 +1094,8 @@ void setup() {
init_closedloop(); init_closedloop();
#endif #endif
#if !HAS_SPI_LCD #if ENABLED(INIT_SDCARD_ON_BOOT) && !HAS_SPI_LCD
card.beginautostart();
#if ENABLED(SD_EEPROM_EMULATION)
SERIAL_ECHOLNPGM("Loading settings from SD");
(void)settings.load();
#endif
#if ENABLED(INIT_SDCARD_ON_BOOT)
card.beginautostart();
#endif
#endif #endif
#if HAS_TRINAMIC && DISABLED(PS_DEFAULT_OFF) #if HAS_TRINAMIC && DISABLED(PS_DEFAULT_OFF)

4
Marlin/src/inc/Conditionals_post.h
View File

@ -1734,7 +1734,3 @@
#define INIT_SDCARD_ON_BOOT #define INIT_SDCARD_ON_BOOT
#endif #endif
#endif #endif
#if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
#define SD_EEPROM_EMULATION
#endif

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

@ -81,10 +81,6 @@
#include "../Marlin.h" #include "../Marlin.h"
#if ENABLED(SD_EEPROM_EMULATION)
#include "../module/configuration_store.h"
#endif
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
#include "../feature/power_loss_recovery.h" #include "../feature/power_loss_recovery.h"
#endif #endif
@ -787,13 +783,8 @@ void MarlinUI::update() {
if (sd_status) { if (sd_status) {
safe_delay(500); // Some boards need a delay to get settled safe_delay(500); // Some boards need a delay to get settled
card.initsd(); 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 card.beginautostart(); // Initial boot
}
else else
set_status_P(PSTR(MSG_SD_INSERTED)); set_status_P(PSTR(MSG_SD_INSERTED));
} }

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

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