From 4e3c1edd529805bf9ed4416d6622046e53999ab5 Mon Sep 17 00:00:00 2001 From: Ben Lye Date: Tue, 28 Nov 2017 10:13:52 +0000 Subject: [PATCH] Add error if CHECK_FOR_BOOTLOADER is not enabled but 'Flash from TX' is Error rather than silently enabling CHECK_FOR_BOOTLOADER. --- Multiprotocol/Validate.h | 10 +++++++--- Multiprotocol/_Config.h | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index fc2c9e4..42efac6 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -18,9 +18,13 @@ #endif #endif -// Automatically enable CHECK_FOR_BOOTLOADER if a FLASH_FROM_TX board is selected -#if defined(ARDUINO_MULTI_FLASH_FROM_TX) || defined(ARDUINO_MULTI_STM32_FLASH_FROM_TX) - #define CHECK_FOR_BOOTLOADER +// Error if CHECK_FOR_BOOTLOADER is not enabled but a FLASH_FROM_TX board is selected +#if (defined(ARDUINO_MULTI_FLASH_FROM_TX) || defined(ARDUINO_MULTI_STM32_FLASH_FROM_TX)) &! defined(CHECK_FOR_BOOTLOADER) + #if defined(STM32_BOARD) + #error "You have selected the 'Flash from TX' upload method but not enabled CHECK_FOR_BOOTLOADER." + #else + #error "You have selected the 'Flash from TX' bootloader but not enabled CHECK_FOR_BOOTLOADER." + #endif #endif // Error if CHECK_FOR_BOOTLOADER is enabled but the 'Flash from TX' bootloader or upload method isn't selected. diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 6e997a5..f172eb7 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -54,7 +54,7 @@ /*************************/ //Allow flashing multimodule directly with TX(erky9x or opentx modified firmwares) //Instructions: https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/tree/master/BootLoaders#compiling--uploading-firmware-with-the-flash-from-tx-bootloader -//To enable this feature remove the "//" on the next line. It is automatically enabled/disabled when you use the AVR Multi boards. +//To enable this feature remove the "//" on the next line. Requires a compatible bootloader or upload method to be selected when you use the Multi 4-in-1 Boards Manager definitions. //#define CHECK_FOR_BOOTLOADER /****************/