瀏覽代碼

Fix ESP32 eeprom flag

Scott Lahteine 5 年之前
父節點
當前提交
f263782f1b
共有 2 個檔案被更改,包括 5 行新增5 行删除
  1. 2
    2
      Marlin/src/HAL/ESP32/eeprom_impl.cpp
  2. 3
    3
      Marlin/src/HAL/ESP32/inc/Conditionals_post.h

+ 2
- 2
Marlin/src/HAL/ESP32/eeprom_impl.cpp 查看文件

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

+ 3
- 3
Marlin/src/HAL/ESP32/inc/Conditionals_post.h 查看文件

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

Loading…
取消
儲存