Wrangle HAL EEPROM types

2020-04-21 21:26:25 -05:00
parent d666ef00e0
commit 0fec478562
10 changed files with 14 additions and 9 deletions
--- a/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
@ -20,7 +20,7 @@

 #include "../../inc/MarlinConfig.h"

-#if ENABLED(EEPROM_SETTINGS)
+#if USE_WIRED_EEPROM

 #include "../shared/eeprom_api.h"

@ -58,5 +58,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
  return false;
 }

-#endif // EEPROM_SETTINGS
+#endif // USE_WIRED_EEPROM
 #endif // __MK20DX256__
--- a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
@ -21,7 +21,6 @@
 */
 #pragma once

-// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
-#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
-  #define SDCARD_EEPROM_EMULATION
+#if USE_FALLBACK_EEPROM
+  #define USE_WIRED_EEPROM 1
 #endif