MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix ESP32 eeprom flag

Browse Source
This commit is contained in:
Scott Lahteine 2020-04-01 23:50:32 -05:00
parent 62e8c2dd87
commit f263782f1b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/HAL/ESP32/eeprom_impl.cpp
View File

@ -24,7 +24,7 @@
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION) #if USE_WIRED_EEPROM
#include "../shared/eeprom_api.h" #include "../shared/eeprom_api.h"
#include <EEPROM.h> #include <EEPROM.h>
@ -59,5 +59,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
size_t PersistentStore::capacity() { return EEPROM_SIZE; } size_t PersistentStore::capacity() { return EEPROM_SIZE; }
#endif // EEPROM_SETTINGS #endif // USE_WIRED_EEPROM
#endif // ARDUINO_ARCH_ESP32 #endif // ARDUINO_ARCH_ESP32

6
Marlin/src/HAL/ESP32/inc/Conditionals_post.h
View File

@ -21,7 +21,7 @@
*/ */
#pragma once #pragma once
// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation #undef USE_WIRED_EEPROM
#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) #if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
#define SDCARD_EEPROM_EMULATION #define USE_WIRED_EEPROM 1
#endif #endif