andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix duplicate board IDs (#14310)

pull/1/head
Bob Kuhn 6 years ago
committed by Scott Lahteine
parent
5307f42917
commit
089d12df16
3 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/Makefile
  2. 4
      Marlin/src/core/boards.h
  3. 8
      buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py

2
Marlin/Makefile
View File

@ -273,7 +273,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),304)
# Einsy Retro # Einsy Retro
else ifeq ($(HARDWARE_MOTHERBOARD),305) else ifeq ($(HARDWARE_MOTHERBOARD),305)
# Elefu Ra Board (v3) # Elefu Ra Board (v3)
else ifeq ($(HARDWARE_MOTHERBOARD),21) else ifeq ($(HARDWARE_MOTHERBOARD),23)
# Leapfrog # Leapfrog
else ifeq ($(HARDWARE_MOTHERBOARD),999) else ifeq ($(HARDWARE_MOTHERBOARD),999)
# Mega controller # Mega controller

4
Marlin/src/core/boards.h
View File

@ -112,7 +112,7 @@
#define BOARD_MINIRAMBO_10A 303 // Mini-Rambo 1.0a #define BOARD_MINIRAMBO_10A 303 // Mini-Rambo 1.0a
#define BOARD_EINSY_RAMBO 304 // Einsy Rambo #define BOARD_EINSY_RAMBO 304 // Einsy Rambo
#define BOARD_EINSY_RETRO 305 // Einsy Retro #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_LEAPFROG 999 // Leapfrog
#define BOARD_MEGACONTROLLER 310 // Mega controller #define BOARD_MEGACONTROLLER 310 // Mega controller
#define BOARD_SCOOVO_X9H 321 // abee Scoovo X9H #define BOARD_SCOOVO_X9H 321 // abee Scoovo X9H
@ -247,7 +247,7 @@
#define BOARD_MORPHEUS 1806 // STM32F103C8/STM32F103CB Libmaple based stm32f1 controller #define BOARD_MORPHEUS 1806 // STM32F103C8/STM32F103CB Libmaple based stm32f1 controller
#define BOARD_MKS_ROBIN 1808 // MKS Robin / STM32F103ZET6 #define BOARD_MKS_ROBIN 1808 // MKS Robin / STM32F103ZET6
#define BOARD_BIGTREE_SKR_MINI_V1_1 1814 // STM32F103RC #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 // STM32 ARM Cortex-M4F

8
buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
View File

@ -1,7 +1,7 @@
Import("env") Import("env")
# Relocate firmware from 0x08000000 to 0x0800A000 # 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 #alternatively, for STSTM <=5.1.0 use line below
#env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728)) #env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x0800A000")) 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' #append ${PROGNAME}.bin firmware after bootloader and save it as 'jgaurora_firmware.bin'
def addboot(source,target,env): def addboot(source,target,env):
import os import os
firmware = open(target[0].path, "rb") firmware = open(target[0].path, "rb")
lengthfirmware = os.path.getsize(target[0].path) lengthfirmware = os.path.getsize(target[0].path)
@ -29,7 +29,7 @@ def addboot(source,target,env):
while position < lengthfirmware: while position < lengthfirmware:
byte = firmware.read(1) byte = firmware.read(1)
firmwareimage.write(byte) firmwareimage.write(byte)
position += 1 position += 1
bootloader.close() bootloader.close()
firmware.close() firmware.close()
firmwareimage.close() firmwareimage.close()
@ -37,7 +37,7 @@ def addboot(source,target,env):
if os.path.exists(firmware_without_bootloader_dir): if os.path.exists(firmware_without_bootloader_dir):
os.remove(firmware_without_bootloader_dir) os.remove(firmware_without_bootloader_dir)
os.rename(target[0].path, 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); env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", addboot);

Write Preview
Loading…
Cancel
Save