gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-13 18:27:55 +00:00
Code Issues Projects Releases Wiki Activity

Add new archives and update JSON

Browse Source
This commit is contained in:
Ben Lye 2017-12-19 14:19:16 +00:00
parent 6e639cf125
commit 90404b422e
6 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
BootLoaders/Archives/package_multi_4in1_avr_board_v1.0.2.tar.gz Normal file
View File

Binary file not shown.

8
BootLoaders/Boards/avr/boards.txt
View File

@ -20,7 +20,7 @@ multiatmega328p.build.f_cpu=16000000L
multiatmega328p.build.core=arduino:arduino multiatmega328p.build.core=arduino:arduino
multiatmega328p.build.variant=arduino:eightanaloginputs multiatmega328p.build.variant=arduino:eightanaloginputs
multiatmega328p.build.extra_flags=-Wl,--relax multiatmega328p.build.extra_flags=-Wl,--relax
multiatmega328p.build.board=MULTI_AVR multiatmega328p.build.board=MULTI_AVR=102
multiatmega328p.board.compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects multiatmega328p.board.compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
multiatmega328p.board.compiler.c.elf.flags=-Os -g -flto -fuse-linker-plugin -Wl,--gc-sections multiatmega328p.board.compiler.c.elf.flags=-Os -g -flto -fuse-linker-plugin -Wl,--gc-sections
@ -37,14 +37,14 @@ multiatmega328p.bootloader.unlock_bits=0x3F
multiatmega328p.bootloader.lock_bits=0x0F multiatmega328p.bootloader.lock_bits=0x0F
multiatmega328p.menu.bootloader.none=No bootloader multiatmega328p.menu.bootloader.none=No bootloader
multiatmega328p.menu.bootloader.none.build.board=MULTI_NO_BOOT=103 multiatmega328p.menu.bootloader.none.build.board=MULTI_NO_BOOT=102
multiatmega328p.menu.bootloader.none.upload.maximum_size=32768 multiatmega328p.menu.bootloader.none.upload.maximum_size=32768
multiatmega328p.menu.bootloader.none.bootloader.file=Multi4in1/AtmegaMultiEmpty.hex multiatmega328p.menu.bootloader.none.bootloader.file=Multi4in1/AtmegaMultiEmpty.hex
multiatmega328p.menu.bootloader.none.bootloader.high_fuses=0xD7 multiatmega328p.menu.bootloader.none.bootloader.high_fuses=0xD7
multiatmega328p.menu.bootloader.optiboot=Flash from TX multiatmega328p.menu.bootloader.optiboot=Flash from TX
multiatmega328p.menu.bootloader.optiboot.build.board=MULTI_FLASH_FROM_TX=103 multiatmega328p.menu.bootloader.optiboot.build.board=MULTI_FLASH_FROM_TX=102
multiatmega328p.menu.bootloader.optiboot.upload.maximum_size=32256 multiatmega328p.menu.bootloader.optiboot.upload.maximum_size=32256
multiatmega328p.menu.bootloader.optiboot.bootloader.file=Multi4in1/AtmegaMultiBoot.hex multiatmega328p.menu.bootloader.optiboot.bootloader.file=Multi4in1/AtmegaMultiBoot.hex
@ -57,7 +57,7 @@ multiatmega328p.menu.bootloader.optiboot.bootloader.high_fuses=0xD6
## -------------------------------------------------- ## --------------------------------------------------
multixmega32d4.name=Multi 4-in-1 (OrangeRX) multixmega32d4.name=Multi 4-in-1 (OrangeRX)
multixmega32d4.build.board=MULTI_ORANGERX=103 multixmega32d4.build.board=MULTI_ORANGERX=102
multixmega32d4.build.mcu=atxmega32d4 multixmega32d4.build.mcu=atxmega32d4
multixmega32d4.build.f_cpu=32000000L multixmega32d4.build.f_cpu=32000000L
multixmega32d4.build.core=xmega multixmega32d4.build.core=xmega

2
BootLoaders/Boards/avr/platform.txt
View File

@ -6,7 +6,7 @@
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
name=Multi 4-in-1 AVR name=Multi 4-in-1 AVR
version=1.0.3 version=1.0.2
compiler.warning_flags=-w compiler.warning_flags=-w
compiler.warning_flags.none=-w compiler.warning_flags.none=-w

6
BootLoaders/Boards/stm32/boards.txt
View File

@ -37,20 +37,20 @@ multistm32f103c.bootloader.tool=serial_upload
#---------------------------- UPLOAD METHODS --------------------------- #---------------------------- UPLOAD METHODS ---------------------------
multistm32f103c.menu.upload_method.TxFlashMethod=Flash from Tx multistm32f103c.menu.upload_method.TxFlashMethod=Flash from Tx
multistm32f103c.menu.upload_method.TxFlashMethod.build.board=MULTI_STM32_FLASH_FROM_TX=103
multistm32f103c.menu.upload_method.TxFlashMethod.upload.tool=tx_upload multistm32f103c.menu.upload_method.TxFlashMethod.upload.tool=tx_upload
multistm32f103c.menu.upload_method.TxFlashMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER multistm32f103c.menu.upload_method.TxFlashMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER
multistm32f103c.menu.upload_method.TxFlashMethod.build.vect=VECT_TAB_ADDR=0x8002000 multistm32f103c.menu.upload_method.TxFlashMethod.build.vect=VECT_TAB_ADDR=0x8002000
multistm32f103c.menu.upload_method.TxFlashMethod.build.ldscript=ld/bootloader_20.ld multistm32f103c.menu.upload_method.TxFlashMethod.build.ldscript=ld/bootloader_20.ld
multistm32f103c.menu.upload_method.TxFlashMethod.build.board=MULTI_STM32_FLASH_FROM_TX=103
multistm32f103c.menu.upload_method.TxFlashMethod.bootloader.file=Multi4in1/StmMultiBoot.bin multistm32f103c.menu.upload_method.TxFlashMethod.bootloader.file=Multi4in1/StmMultiBoot.bin
multistm32f103c.menu.upload_method.DFUUploadMethod=Upload via USB multistm32f103c.menu.upload_method.DFUUploadMethod=Upload via USB
multistm32f103c.menu.upload_method.DFUUploadMethod.build.board=MULTI_STM32_NO_BOOT=103
multistm32f103c.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu multistm32f103c.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu
multistm32f103c.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload multistm32f103c.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload
multistm32f103c.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER multistm32f103c.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER
multistm32f103c.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000 multistm32f103c.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000
multistm32f103c.menu.upload_method.DFUUploadMethod.build.ldscript=ld/bootloader_20.ld multistm32f103c.menu.upload_method.DFUUploadMethod.build.ldscript=ld/bootloader_20.ld
multistm32f103c.menu.upload_method.DFUUploadMethod.build.board=MULTI_STM32_NO_BOOT=103
multistm32f103c.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003 multistm32f103c.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003
multistm32f103c.menu.upload_method.DFUUploadMethod.upload.altID=2 multistm32f103c.menu.upload_method.DFUUploadMethod.upload.altID=2
multistm32f103c.menu.upload_method.DFUUploadMethod.bootloader.file=Multi4in1/StmMultiUSB.bin multistm32f103c.menu.upload_method.DFUUploadMethod.bootloader.file=Multi4in1/StmMultiUSB.bin
@ -59,6 +59,6 @@ multistm32f103c.menu.upload_method.serialMethod=Upload via Serial (FTDI)
multistm32f103c.menu.upload_method.serialMethod.upload.protocol=maple_serial multistm32f103c.menu.upload_method.serialMethod.upload.protocol=maple_serial
multistm32f103c.menu.upload_method.serialMethod.upload.tool=serial_upload multistm32f103c.menu.upload_method.serialMethod.upload.tool=serial_upload
multistm32f103c.menu.upload_method.serialMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG multistm32f103c.menu.upload_method.serialMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
multistm32f103c.menu.upload_method.serialMethod.build.board=MULTI_STM32_NO_BOOT multistm32f103c.menu.upload_method.serialMethod.build.board=MULTI_STM32_NO_BOOT=103
############################################################## ##############################################################

59
BootLoaders/package_multi_4in1_board_index.json
View File

@ -8,14 +8,14 @@
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module" "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
}, },
"platforms": [{ "platforms": [{
"name": "Multi 4-in-1 AVR Board", "name": "Multi 4-in-1 AVR Boards",
"architecture": "avr", "architecture": "avr",
"version": "1.0.0", "version": "1.0.0",
"category": "Contributed", "category": "Contributed",
"help": { "help": {
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module" "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
}, },
"url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/raw/master/BootLoaders/package_multi_4in1_board_v1.0.0.zip", "url": "https://github.com/benlye/DIY-Multiprotocol-TX-Module/raw/board-updates-6/BootLoaders/Archives/package_multi_4in1_board_v1.0.0.zip",
"archiveFileName": "package_multi_4in1_board_v1.0.0.zip", "archiveFileName": "package_multi_4in1_board_v1.0.0.zip",
"checksum": "SHA-256:3DE301E9FC3C8A81CB2CEDE3458A68C626A9A5C37A73FA9C85BE9D841935684D", "checksum": "SHA-256:3DE301E9FC3C8A81CB2CEDE3458A68C626A9A5C37A73FA9C85BE9D841935684D",
"size": "3205", "size": "3205",
@ -25,14 +25,14 @@
"toolsDependencies": [] "toolsDependencies": []
}, },
{ {
"name": "Multi 4-in-1 AVR Board", "name": "Multi 4-in-1 AVR Boards",
"architecture": "avr", "architecture": "avr",
"version": "1.0.1", "version": "1.0.1",
"category": "Contributed", "category": "Contributed",
"help": { "help": {
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module" "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
}, },
"url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/raw/master/BootLoaders/package_multi_4in1_avr_board_v1.0.1.tar.gz", "url": "https://github.com/benlye/DIY-Multiprotocol-TX-Module/raw/board-updates-6/BootLoaders/Archives/package_multi_4in1_avr_board_v1.0.1.tar.gz",
"archiveFileName": "package_multi_4in1_avr_board_v1.0.1.tar.gz", "archiveFileName": "package_multi_4in1_avr_board_v1.0.1.tar.gz",
"checksum": "SHA-256:9bb29828476c141f5ef877e66b80ca969021d648acaf1ac5248676beb9ee3003", "checksum": "SHA-256:9bb29828476c141f5ef877e66b80ca969021d648acaf1ac5248676beb9ee3003",
"size": "3201", "size": "3201",
@ -41,6 +41,24 @@
}], }],
"toolsDependencies": [] "toolsDependencies": []
}, },
{
"name": "Multi 4-in-1 AVR Boards",
"architecture": "avr",
"version": "1.0.2",
"category": "Contributed",
"help": {
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
},
"url": "https://github.com/benlye/DIY-Multiprotocol-TX-Module/raw/board-updates-6/BootLoaders/Archives/package_multi_4in1_avr_board_v1.0.2.tar.gz",
"archiveFileName": "package_multi_4in1_avr_board_v1.0.2.tar.gz",
"checksum": "SHA-256:491a5b4e5187f8543adf1bfc8ccf34c886ffe6726f2a1c075048cb2c53ec3002",
"size": "166228",
"boards": [
{"name": "Multi 4-in-1 (Atmega328p, 3.3V, 16MHz)"},
{"name": "Multi 4-in-1 (OrangeRX)"}
],
"toolsDependencies": []
},
{ {
"name": "Multi 4-in-1 STM32 Board", "name": "Multi 4-in-1 STM32 Board",
"architecture": "STM32F1", "architecture": "STM32F1",
@ -49,7 +67,7 @@
"help": { "help": {
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module" "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
}, },
"url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/raw/master/BootLoaders/package_multi_4in1_stm32_board_v1.0.0.zip", "url": "https://github.com/benlye/DIY-Multiprotocol-TX-Module/raw/board-updates-6/BootLoaders/Archives/package_multi_4in1_stm32_board_v1.0.0.zip",
"archiveFileName": "package_multi_4in1_stm32_board_v1.0.0.zip", "archiveFileName": "package_multi_4in1_stm32_board_v1.0.0.zip",
"checksum": "SHA-256:7B661C6455F5AD7329E61EC297D4ADED9EF19F618E04E09A35A3C840977A56F5", "checksum": "SHA-256:7B661C6455F5AD7329E61EC297D4ADED9EF19F618E04E09A35A3C840977A56F5",
"size": "10896168", "size": "10896168",
@ -70,7 +88,7 @@
"help": { "help": {
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module" "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
}, },
"url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/raw/master/BootLoaders/package_multi_4in1_stm32_board_v1.0.1.tar.gz", "url": "https://github.com/benlye/DIY-Multiprotocol-TX-Module/raw/board-updates-6/BootLoaders/Archives/package_multi_4in1_stm32_board_v1.0.1.tar.gz",
"archiveFileName": "package_multi_4in1_stm32_board_v1.0.1.tar.gz", "archiveFileName": "package_multi_4in1_stm32_board_v1.0.1.tar.gz",
"checksum": "SHA-256:b522b5d3474308768c197a6897cad037fb54d6fac26c75678415a0908793bae3", "checksum": "SHA-256:b522b5d3474308768c197a6897cad037fb54d6fac26c75678415a0908793bae3",
"size": "10332106", "size": "10332106",
@ -91,10 +109,10 @@
"help": { "help": {
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module" "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
}, },
"url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/raw/master/BootLoaders/package_multi_4in1_stm32_board_v1.0.2.tar.gz", "url": "https://github.com/benlye/DIY-Multiprotocol-TX-Module/raw/board-updates-6/BootLoaders/Archives/package_multi_4in1_stm32_board_v1.0.2.tar.gz",
"archiveFileName": "package_multi_4in1_stm32_board_v1.0.2.tar.gz", "archiveFileName": "package_multi_4in1_stm32_board_v1.0.2.tar.gz",
"checksum": "SHA-256:26D21DBD2FE80680AC523B8BCA24B3ECF2C2016BAC626826D20B651E11278287", "checksum": "SHA-256:26D21DBD2FE80680AC523B8BCA24B3ECF2C2016BAC626826D20B651E11278287",
"size": "103318646", "size": "10318646",
"boards": [{ "boards": [{
"name": "Multi 4-in-1 (STM32F103C)" "name": "Multi 4-in-1 (STM32F103C)"
}], }],
@ -105,14 +123,35 @@
}] }]
}, },
{ {
"name": "Multi 4-in-1 OrangeRX Board", "name": "Multi 4-in-1 STM32 Board",
"architecture": "STM32F1",
"version": "1.0.3",
"category": "Contributed",
"help": {
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
},
"url": "https://github.com/benlye/DIY-Multiprotocol-TX-Module/raw/board-updates-6/BootLoaders/Archives/package_multi_4in1_stm32_board_v1.0.3.tar.gz",
"archiveFileName": "package_multi_4in1_stm32_board_v1.0.3.tar.gz",
"checksum": "SHA-256:0AD9EA6A55132FE36425465C5CA65F928516749C8081995141F3DC47CA4F3EED",
"size": "10315318",
"boards": [{
"name": "Multi 4-in-1 (STM32F103C)"
}],
"toolsDependencies": [{
"packager": "arduino",
"name": "arm-none-eabi-gcc",
"version": "4.8.3-2014q1"
}]
},
{
"name": "Multi 4-in-1 OrangeRX Board - DEPRECATED, USE MULTI 4-IN-1 AVR BOARDS PACKAGE INSTEAD",
"architecture": "orangerx", "architecture": "orangerx",
"version": "1.0.1", "version": "1.0.1",
"category": "Contributed", "category": "Contributed",
"help": { "help": {
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module" "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
}, },
"url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/raw/master/BootLoaders/package_multi_4in1_orangerx_board_v1.0.1.tar.gz", "url": "https://github.com/benlye/DIY-Multiprotocol-TX-Module/raw/board-updates-6/BootLoaders/Archives/package_multi_4in1_orangerx_board_v1.0.1.tar.gz",
"archiveFileName": "package_multi_4in1_orangerx_board_v1.0.1.tar.gz", "archiveFileName": "package_multi_4in1_orangerx_board_v1.0.1.tar.gz",
"checksum": "SHA-256:7287ce61028b754bb8ff947317dd15773fc7eeecd752826c707fa356b9b36dc6", "checksum": "SHA-256:7287ce61028b754bb8ff947317dd15773fc7eeecd752826c707fa356b9b36dc6",
"size": "161615", "size": "161615",

8
Multiprotocol/Validate.h
View File

@ -19,16 +19,16 @@
#endif #endif
// Check for minimum version of multi-module boards // Check for minimum version of multi-module boards
#define MIN_AVR_BOARD 103 #define MIN_AVR_BOARD 102
#define MIN_ORX_BOARD 103 #define MIN_ORX_BOARD 102
#define MIN_STM32_BOARD 103 #define MIN_STM32_BOARD 103
//AVR //AVR
#if (defined(ARDUINO_MULTI_NO_BOOT) && ARDUINO_MULTI_NO_BOOT < MIN_AVR_BOARD) || (defined(ARDUINO_MULTI_FLASH_FROM_TX) && ARDUINO_MULTI_FLASH_FROM_TX < MIN_AVR_BOARD) #if (defined(ARDUINO_MULTI_NO_BOOT) && ARDUINO_MULTI_NO_BOOT < MIN_AVR_BOARD) || (defined(ARDUINO_MULTI_FLASH_FROM_TX) && ARDUINO_MULTI_FLASH_FROM_TX < MIN_AVR_BOARD)
#error You need to update your Multi 4-in-1 board definition. Open Boards Manager and update to the latest version of the Multi 4-in-1 AVR Board. #error You need to update your Multi 4-in-1 board definition. Open Boards Manager and update to the latest version of the Multi 4-in-1 AVR Boards.
#endif #endif
//OrangeRX //OrangeRX
#if (defined(ARDUINO_MULTI_ORANGERX) && ARDUINO_MULTI_ORANGERX < MIN_ORX_BOARD) #if (defined(ARDUINO_MULTI_ORANGERX) && ARDUINO_MULTI_ORANGERX < MIN_ORX_BOARD)
#error You need to update your Multi 4-in-1 board definition. Open Boards Manager and update to the latest version of the Multi 4-in-1 OrangeRX Board. #error You need to update your Multi 4-in-1 board definition. Open Boards Manager and update to the latest version of the Multi 4-in-1 AVR Boards.
#endif #endif
//STM32 //STM32
#if (defined(ARDUINO_MULTI_STM32_NO_BOOT) && ARDUINO_MULTI_STM32_NO_BOOT < MIN_STM32_BOARD) || (defined(ARDUINO_MULTI_STM32_FLASH_FROM_TX) && ARDUINO_MULTI_STM32_FLASH_FROM_TX < MIN_STM32_BOARD) #if (defined(ARDUINO_MULTI_STM32_NO_BOOT) && ARDUINO_MULTI_STM32_NO_BOOT < MIN_STM32_BOARD) || (defined(ARDUINO_MULTI_STM32_FLASH_FROM_TX) && ARDUINO_MULTI_STM32_FLASH_FROM_TX < MIN_STM32_BOARD)