From 6fea0c2a934582b527afa8f58fb96b6d859f8c49 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Wed, 24 Jan 2018 10:17:23 +0100 Subject: [PATCH] Force latest board versions --- Multiprotocol/AFHDS2A_a7105.ino | 2 +- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/Validate.h | 16 ++++++---------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Multiprotocol/AFHDS2A_a7105.ino b/Multiprotocol/AFHDS2A_a7105.ino index 4cb1675..6d4356d 100644 --- a/Multiprotocol/AFHDS2A_a7105.ino +++ b/Multiprotocol/AFHDS2A_a7105.ino @@ -361,7 +361,7 @@ uint16_t initAFHDS2A() { phase = AFHDS2A_DATA; //Read RX ID from EEPROM based on RX_num, RX_num must be uniq for each RX - uint8_t temp=50+RX_num*4; + uint8_t temp=AFHDS2A_EEPROM_OFFSET+RX_num*4; for(uint8_t i=0;i<4;i++) rx_id[i]=eeprom_read_byte((EE_ADDR)(temp+i)); } diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 7819f6c..07b2938 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_REVISION 0 -#define VERSION_PATCH_LEVEL 13 +#define VERSION_PATCH_LEVEL 14 //****************** // Protocols //****************** diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index 0237f5b..4e90edd 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -19,9 +19,9 @@ #endif // Check for minimum version of multi-module boards -#define MIN_AVR_BOARD 102 -#define MIN_ORX_BOARD 102 -#define MIN_STM32_BOARD 103 +#define MIN_AVR_BOARD 103 +#define MIN_ORX_BOARD 103 +#define MIN_STM32_BOARD 104 //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) #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. @@ -44,13 +44,9 @@ #endif #endif -// Error if CHECK_FOR_BOOTLOADER is enabled but the 'Flash from TX' bootloader or upload method isn't selected. -#if (defined(ARDUINO_MULTI_NO_BOOT) || defined(ARDUINO_MULTI_STM32_NO_BOOT)) && defined(CHECK_FOR_BOOTLOADER) - #if defined(STM32_BOARD) - #warning "You have enabled CHECK_FOR_BOOTLOADER but not selected the 'Flash from TX' upload method." - #else - #error "You have enabled CHECK_FOR_BOOTLOADER but not selected the 'Flash from TX' bootloader." - #endif +// Error if CHECK_FOR_BOOTLOADER is enabled but the 'Flash from TX' bootloader +#if defined(ARDUINO_MULTI_NO_BOOT) && defined(CHECK_FOR_BOOTLOADER) + #error "You have enabled CHECK_FOR_BOOTLOADER but not selected the 'Flash from TX' bootloader." #endif //Check failsafe throttle value