From 089d12df1610f3273f6f4ef87c8469f65ee6ca2e Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Tue, 18 Jun 2019 02:26:13 -0500
Subject: [PATCH] Fix duplicate board IDs (#14310)

---
 Marlin/Makefile                                           | 2 +-
 Marlin/src/core/boards.h                                  | 4 ++--
 .../PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/Makefile b/Marlin/Makefile
index 1ffaa2b92..12e72cc9f 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -273,7 +273,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),304)
 # Einsy Retro
 else ifeq ($(HARDWARE_MOTHERBOARD),305)
 # Elefu Ra Board (v3)
-else ifeq ($(HARDWARE_MOTHERBOARD),21)
+else ifeq ($(HARDWARE_MOTHERBOARD),23)
 # Leapfrog
 else ifeq ($(HARDWARE_MOTHERBOARD),999)
 # Mega controller
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index e4aa7030a..bbbcc9bee 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -112,7 +112,7 @@
 #define BOARD_MINIRAMBO_10A     303   // Mini-Rambo 1.0a
 #define BOARD_EINSY_RAMBO       304   // Einsy Rambo
 #define BOARD_EINSY_RETRO       305   // Einsy Retro
-#define BOARD_ELEFU_3           21    // Elefu Ra Board (v3)
+#define BOARD_ELEFU_3           23    // Elefu Ra Board (v3)
 #define BOARD_LEAPFROG          999   // Leapfrog
 #define BOARD_MEGACONTROLLER    310   // Mega controller
 #define BOARD_SCOOVO_X9H        321   // abee Scoovo X9H
@@ -247,7 +247,7 @@
 #define BOARD_MORPHEUS         1806   // STM32F103C8/STM32F103CB Libmaple based stm32f1 controller
 #define BOARD_MKS_ROBIN        1808   // MKS Robin / STM32F103ZET6
 #define BOARD_BIGTREE_SKR_MINI_V1_1 1814 // STM32F103RC
-#define BOARD_JGAURORA_A5S_A1  1810   // JGAurora A5S A1 / STM32F103ZET6
+#define BOARD_JGAURORA_A5S_A1  1820   // JGAurora A5S A1 / STM32F103ZET6
 
 //
 // STM32 ARM Cortex-M4F
diff --git a/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py b/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
index 72a6dcb37..89e7b3bc1 100644
--- a/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+++ b/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
@@ -1,7 +1,7 @@
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x0800A000
-env['CPPDEFINES'].remove(("VECT_TAB_ADDR", "0x8000000")) 
+env['CPPDEFINES'].remove(("VECT_TAB_ADDR", "0x8000000"))
 #alternatively, for STSTM <=5.1.0 use line below
 #env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
 env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x0800A000"))
@@ -9,7 +9,7 @@ env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/jgaurora_a5s_a1.
 
 #append ${PROGNAME}.bin firmware after bootloader and save it as 'jgaurora_firmware.bin'
 def addboot(source,target,env):
-	import os	
+	import os
 
 	firmware = open(target[0].path, "rb")
 	lengthfirmware = os.path.getsize(target[0].path)
@@ -29,7 +29,7 @@ def addboot(source,target,env):
 	while position < lengthfirmware:
 		byte = firmware.read(1)
 		firmwareimage.write(byte)
-		position += 1	
+		position += 1
 	bootloader.close()
 	firmware.close()
 	firmwareimage.close()
@@ -37,7 +37,7 @@ def addboot(source,target,env):
 	if os.path.exists(firmware_without_bootloader_dir):
 		os.remove(firmware_without_bootloader_dir)
 	os.rename(target[0].path, firmware_without_bootloader_dir)
-	#os.rename(target[0].dir.path+'/firmware_with_bootloader.bin', target[0].dir.path+'/firmware.bin') 
+	#os.rename(target[0].dir.path+'/firmware_with_bootloader.bin', target[0].dir.path+'/firmware.bin')
 
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", addboot);