Browse Source

Fix duplicate board IDs (#14310)

Bob Kuhn 6 years ago
parent
commit
089d12df16

+ 1
- 1
Marlin/Makefile View File

273
 # Einsy Retro
273
 # Einsy Retro
274
 else ifeq ($(HARDWARE_MOTHERBOARD),305)
274
 else ifeq ($(HARDWARE_MOTHERBOARD),305)
275
 # Elefu Ra Board (v3)
275
 # Elefu Ra Board (v3)
276
-else ifeq ($(HARDWARE_MOTHERBOARD),21)
276
+else ifeq ($(HARDWARE_MOTHERBOARD),23)
277
 # Leapfrog
277
 # Leapfrog
278
 else ifeq ($(HARDWARE_MOTHERBOARD),999)
278
 else ifeq ($(HARDWARE_MOTHERBOARD),999)
279
 # Mega controller
279
 # Mega controller

+ 2
- 2
Marlin/src/core/boards.h View File

112
 #define BOARD_MINIRAMBO_10A     303   // Mini-Rambo 1.0a
112
 #define BOARD_MINIRAMBO_10A     303   // Mini-Rambo 1.0a
113
 #define BOARD_EINSY_RAMBO       304   // Einsy Rambo
113
 #define BOARD_EINSY_RAMBO       304   // Einsy Rambo
114
 #define BOARD_EINSY_RETRO       305   // Einsy Retro
114
 #define BOARD_EINSY_RETRO       305   // Einsy Retro
115
-#define BOARD_ELEFU_3           21    // Elefu Ra Board (v3)
115
+#define BOARD_ELEFU_3           23    // Elefu Ra Board (v3)
116
 #define BOARD_LEAPFROG          999   // Leapfrog
116
 #define BOARD_LEAPFROG          999   // Leapfrog
117
 #define BOARD_MEGACONTROLLER    310   // Mega controller
117
 #define BOARD_MEGACONTROLLER    310   // Mega controller
118
 #define BOARD_SCOOVO_X9H        321   // abee Scoovo X9H
118
 #define BOARD_SCOOVO_X9H        321   // abee Scoovo X9H
247
 #define BOARD_MORPHEUS         1806   // STM32F103C8/STM32F103CB Libmaple based stm32f1 controller
247
 #define BOARD_MORPHEUS         1806   // STM32F103C8/STM32F103CB Libmaple based stm32f1 controller
248
 #define BOARD_MKS_ROBIN        1808   // MKS Robin / STM32F103ZET6
248
 #define BOARD_MKS_ROBIN        1808   // MKS Robin / STM32F103ZET6
249
 #define BOARD_BIGTREE_SKR_MINI_V1_1 1814 // STM32F103RC
249
 #define BOARD_BIGTREE_SKR_MINI_V1_1 1814 // STM32F103RC
250
-#define BOARD_JGAURORA_A5S_A1  1810   // JGAurora A5S A1 / STM32F103ZET6
250
+#define BOARD_JGAURORA_A5S_A1  1820   // JGAurora A5S A1 / STM32F103ZET6
251
 
251
 
252
 //
252
 //
253
 // STM32 ARM Cortex-M4F
253
 // STM32 ARM Cortex-M4F

+ 4
- 4
buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py View File

1
 Import("env")
1
 Import("env")
2
 
2
 
3
 # Relocate firmware from 0x08000000 to 0x0800A000
3
 # Relocate firmware from 0x08000000 to 0x0800A000
4
-env['CPPDEFINES'].remove(("VECT_TAB_ADDR", "0x8000000")) 
4
+env['CPPDEFINES'].remove(("VECT_TAB_ADDR", "0x8000000"))
5
 #alternatively, for STSTM <=5.1.0 use line below
5
 #alternatively, for STSTM <=5.1.0 use line below
6
 #env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
6
 #env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
7
 env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x0800A000"))
7
 env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x0800A000"))
9
 
9
 
10
 #append ${PROGNAME}.bin firmware after bootloader and save it as 'jgaurora_firmware.bin'
10
 #append ${PROGNAME}.bin firmware after bootloader and save it as 'jgaurora_firmware.bin'
11
 def addboot(source,target,env):
11
 def addboot(source,target,env):
12
-	import os	
12
+	import os
13
 
13
 
14
 	firmware = open(target[0].path, "rb")
14
 	firmware = open(target[0].path, "rb")
15
 	lengthfirmware = os.path.getsize(target[0].path)
15
 	lengthfirmware = os.path.getsize(target[0].path)
29
 	while position < lengthfirmware:
29
 	while position < lengthfirmware:
30
 		byte = firmware.read(1)
30
 		byte = firmware.read(1)
31
 		firmwareimage.write(byte)
31
 		firmwareimage.write(byte)
32
-		position += 1	
32
+		position += 1
33
 	bootloader.close()
33
 	bootloader.close()
34
 	firmware.close()
34
 	firmware.close()
35
 	firmwareimage.close()
35
 	firmwareimage.close()
37
 	if os.path.exists(firmware_without_bootloader_dir):
37
 	if os.path.exists(firmware_without_bootloader_dir):
38
 		os.remove(firmware_without_bootloader_dir)
38
 		os.remove(firmware_without_bootloader_dir)
39
 	os.rename(target[0].path, firmware_without_bootloader_dir)
39
 	os.rename(target[0].path, firmware_without_bootloader_dir)
40
-	#os.rename(target[0].dir.path+'/firmware_with_bootloader.bin', target[0].dir.path+'/firmware.bin') 
40
+	#os.rename(target[0].dir.path+'/firmware_with_bootloader.bin', target[0].dir.path+'/firmware.bin')
41
 
41
 
42
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", addboot);
42
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", addboot);
43
 
43
 

Loading…
Cancel
Save