Use MARLIN_EEPROM_SIZE with E2END as fallback (#18059)

2020-05-22 02:15:40 -05:00
parent 31eb487da5
commit 461647fcee
49 changed files with 205 additions and 201 deletions
--- a/Marlin/src/pins/stm32f4/pins_ARMED.h
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@ -39,9 +39,7 @@
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME

 #define I2C_EEPROM
-
-#undef E2END                                      // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
-#define E2END 0xFFF                               // 4KB
+#define MARLIN_EEPROM_SIZE 0x1000                 // 4KB

 //
 // Limit Switches
--- a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
+++ b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
@ -40,8 +40,8 @@
 #define DEFAULT_MACHINE_NAME "STM32F407VET6"

 //#define I2C_EEPROM
-//#define E2END 0x1FFF                            // 8KB
 #define SRAM_EEPROM_EMULATION
+#define MARLIN_EEPROM_SIZE 0x2000                 // 8KB

 //
 // Servos
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@ -33,8 +33,7 @@

 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#undef E2END
-#define E2END 0x1FFF // EEPROM end address 24C64 (64Kb = 8KB)
+#define MARLIN_EEPROM_SIZE 0x2000                 // 8KB (24C64 ... 64Kb = 8KB)

 #define TP                                        // Enable to define servo and probe pins

--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@ -31,8 +31,7 @@
 #define BOARD_WEBSITE_URL    "github.com/FLYmaker/FLYF407ZG"
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME

-#undef E2END
-#define E2END 0xFFF                               // 4KB
+#define MARLIN_EEPROM_SIZE 0x1000                 // 4KB

 //
 // Servos
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@ -51,8 +51,7 @@
  // 128 kB sector allocated for EEPROM emulation.
  #define FLASH_EEPROM_LEVELING
 #elif ENABLED(I2C_EEPROM)
-  #undef E2END                                    // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
-  #define E2END 0xFFF                             // 4KB
+  #define MARLIN_EEPROM_SIZE 0x1000               // 4KB
 #endif

 //
--- a/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
+++ b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
@ -36,8 +36,8 @@

 //#define I2C_EEPROM

-#ifndef E2END
-  #define E2END 0xFFF                             // 4KB
+#ifndef MARLIN_EEPROM_SIZE
+  #define MARLIN_EEPROM_SIZE 0x1000               // 4KB
 #endif

 // Ignore temp readings during development.
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@ -35,10 +35,7 @@
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME

 //#define I2C_EEPROM
-#ifdef E2END
-  #undef E2END
-#endif
-#define E2END 0xFFF                               // 4KB
+#define MARLIN_EEPROM_SIZE 0x1000                 // 4KB

 //
 // Limit Switches
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@ -31,8 +31,7 @@
 #define BOARD_INFO_NAME      "STM32F4 VAkE"

 //#define I2C_EEPROM
-
-#define E2END 0xFFF                               // EEPROM end address (4kB)
+#define MARLIN_EEPROM_SIZE 0x1000                 // 4KB

 //
 // Servos