From 82cafc9b1992541ecc61a5fb0ca426ea6e96ccc8 Mon Sep 17 00:00:00 2001
From: Karl Andersson <karl@iaccess.se>
Date: Fri, 12 Jul 2019 13:06:04 +0200
Subject: [PATCH] pins_ARMED overrides STM32 defines (#14587)

---
 Marlin/src/pins/stm32/pins_ARMED.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32/pins_ARMED.h b/Marlin/src/pins/stm32/pins_ARMED.h
index 4f9acc44b7..c793d83da5 100644
--- a/Marlin/src/pins/stm32/pins_ARMED.h
+++ b/Marlin/src/pins/stm32/pins_ARMED.h
@@ -25,13 +25,17 @@
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
 #endif
 
-#define ARMED_V1_1
+#ifndef ARMED_V1_0
+  #define ARMED_V1_1
+#endif
 
+#undef BOARD_NAME // Defined on the command line by Arduino Core STM32
 #define BOARD_NAME           "Arm'ed"
 #define DEFAULT_MACHINE_NAME BOARD_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
 
 #if HOTENDS > 2 || E_STEPPERS > 2