From 01e88132867e5c73409c43d83be37ef86286ef86 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 9 Jul 2019 21:30:07 -0500
Subject: [PATCH] EEPROM_EMULATED_WITH_SRAM => SRAM_EEPROM_EMULATION

---
 Marlin/src/HAL/HAL_STM32/HAL.cpp                   |  6 +++---
 Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp | 14 +++++++-------
 Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h        |  2 +-
 Marlin/src/pins/pins_BLACK_STM32F407VE.h           |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/HAL/HAL_STM32/HAL.cpp b/Marlin/src/HAL/HAL_STM32/HAL.cpp
index 8eb3c588f..400c8a5e3 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.cpp
+++ b/Marlin/src/HAL/HAL_STM32/HAL.cpp
@@ -28,13 +28,13 @@
 #include "../../inc/MarlinConfig.h"
 #include "../shared/Delay.h"
 
-#if ENABLED(EEPROM_EMULATED_WITH_SRAM)
+#if ENABLED(SRAM_EEPROM_EMULATION)
   #if STM32F7xx
     #include "stm32f7xx_ll_pwr.h"
   #elif STM32F4xx
     #include "stm32f4xx_ll_pwr.h"
   #else
-    #error "EEPROM_EMULATED_WITH_SRAM is currently only supported for STM32F4xx and STM32F7xx"
+    #error "SRAM_EEPROM_EMULATION is currently only supported for STM32F4xx and STM32F7xx"
   #endif
 #endif
 
@@ -100,7 +100,7 @@ void HAL_init(void) {
     OUT_WRITE(LED_PIN, LOW);
   #endif
 
-  #if ENABLED(EEPROM_EMULATED_WITH_SRAM)
+  #if ENABLED(SRAM_EEPROM_EMULATION)
   // Enable access to backup SRAM
   __HAL_RCC_PWR_CLK_ENABLE();
   HAL_PWR_EnableBkUpAccess();
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp b/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
index 1161db2cb..e2972ce9c 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
@@ -28,20 +28,20 @@
 
 #include "../shared/persistent_store_api.h"
 
-#if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM)
+#if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
   #include <EEPROM.h>
   static bool eeprom_data_written = false;
 #endif
 
 bool PersistentStore::access_start() {
-  #if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM)
+  #if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
     eeprom_buffer_fill();
   #endif
   return true;
 }
 
 bool PersistentStore::access_finish() {
-  #if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM)
+  #if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
     if (eeprom_data_written) {
       eeprom_buffer_flush();
       eeprom_data_written = false;
@@ -66,7 +66,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
           return true;
         }
       }
-    #elif DISABLED(EEPROM_EMULATED_WITH_SRAM)
+    #elif DISABLED(SRAM_EEPROM_EMULATION)
       eeprom_buffered_write_byte(pos, v);
     #else
       *(__IO uint8_t *)(BKPSRAM_BASE + (uint8_t * const)pos) = v;
@@ -76,7 +76,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
     pos++;
     value++;
   };
-  #if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM)
+  #if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
     eeprom_data_written = true;
   #endif
 
@@ -89,7 +89,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
     const uint8_t c = (
       #if EITHER(SPI_EEPROM, I2C_EEPROM)
         eeprom_read_byte((uint8_t*)pos)
-      #elif DISABLED(EEPROM_EMULATED_WITH_SRAM)
+      #elif DISABLED(SRAM_EEPROM_EMULATION)
         eeprom_buffered_read_byte(pos)
       #else
         (*(__IO uint8_t *)(BKPSRAM_BASE + ((uint8_t*)pos)))
@@ -107,7 +107,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 size_t PersistentStore::capacity() {
   #if EITHER(SPI_EEPROM, I2C_EEPROM)
     return E2END + 1;
-  #elif DISABLED(EEPROM_EMULATED_WITH_SRAM)
+  #elif DISABLED(SRAM_EEPROM_EMULATION)
     return E2END + 1;
   #else
     return 4096; // 4kB
diff --git a/Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h b/Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h
index 79c7db624..812356555 100644
--- a/Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h
+++ b/Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h
@@ -31,7 +31,7 @@
 
 #define BOARD_NAME "BIGTREE SKR Pro V1.1"
 
-#define EEPROM_EMULATED_WITH_SRAM
+#define SRAM_EEPROM_EMULATION
 
 //
 // Servos
diff --git a/Marlin/src/pins/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/pins_BLACK_STM32F407VE.h
index 516d310f1..bcc6b56ce 100644
--- a/Marlin/src/pins/pins_BLACK_STM32F407VE.h
+++ b/Marlin/src/pins/pins_BLACK_STM32F407VE.h
@@ -41,7 +41,7 @@
 
 //#define I2C_EEPROM
 //#define E2END 0x1FFF // EEPROM end address (8kB)
-#define EEPROM_EMULATED_WITH_SRAM
+#define SRAM_EEPROM_EMULATION
 
 #if HOTENDS > 2 || E_STEPPERS > 2
   #error "Black STM32F4VET6 supports up to 2 hotends / E-steppers."