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

Merge branch 'master' into SPort_Send

Browse Source
This commit is contained in:
pascallanger 2019-10-04 10:32:37 +02:00
commit c7a3548df0
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
BootLoaders/package_multi_4in1_board_index.json
View File

@ -152,6 +152,24 @@
], ],
"toolsDependencies": [] "toolsDependencies": []
}, },
{
"name": "Multi 4-in-1 AVR Boards",
"architecture": "avr",
"version": "1.1.0",
"category": "Contributed",
"help": {
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
},
"url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/raw/master/archives/package_multi_4in1_avr_board_v1.1.0.tar.gz",
"archiveFileName": "package_multi_4in1_avr_board_v1.1.0.tar.gz",
"checksum": "SHA-256:7bacf2db754ceb890a203de5ce89d97aa787a9e6462debeb44cf04830859687a",
"size": "326431",
"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",
@ -488,6 +506,27 @@
"version": "4.8.3-2014q1" "version": "4.8.3-2014q1"
}] }]
}, },
{
"name": "Multi 4-in-1 STM32 Board",
"architecture": "STM32F1",
"version": "1.1.7",
"category": "Contributed",
"help": {
"online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
},
"url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/raw/master/archives/package_multi_4in1_stm32_board_v1.1.7.tar.gz",
"archiveFileName": "package_multi_4in1_stm32_board_v1.1.7.tar.gz",
"checksum": "SHA-256:37cccde7eafad3d0587d28d13d5f8b2b3244bf7c83e6819b6cb08f4f468815e2",
"size": "7966348",
"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", "name": "Multi 4-in-1 OrangeRX Board - DEPRECATED, USE MULTI 4-IN-1 AVR BOARDS PACKAGE INSTEAD",
"architecture": "orangerx", "architecture": "orangerx",

6
Multiprotocol/Validate.h
View File

@ -19,9 +19,9 @@
#endif #endif
// Check for minimum board file definition version for DIY multi-module boards // Check for minimum board file definition version for DIY multi-module boards
#define MIN_AVR_BOARD 109 #define MIN_AVR_BOARD 110
#define MIN_ORX_BOARD 109 #define MIN_ORX_BOARD 110
#define MIN_STM32_BOARD 116 #define MIN_STM32_BOARD 117
//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 Boards. #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.