bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 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
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"
#if ENABLED(SD_EEPROM_EMULATION)
#if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
#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; }
#endif // SD_EEPROM_EMULATION
#endif // EEPROM_SETTINGS
#endif // ARDUINO_ARCH_ESP32

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

@ -28,7 +28,7 @@
#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"