From 2f3ea323c737ffdb2584aa970016160beb7e399e Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Sat, 24 Aug 2019 21:50:36 +0200 Subject: [PATCH] CHECK_FOR_BOOTLOADER now enabled by default in _config.h --- Multiprotocol/Multi.txt | 6 +++--- Multiprotocol/Validate.h | 5 +++-- Multiprotocol/_Config.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Multiprotocol/Multi.txt b/Multiprotocol/Multi.txt index abd0c4d..0eb0d6c 100644 --- a/Multiprotocol/Multi.txt +++ b/Multiprotocol/Multi.txt @@ -47,8 +47,8 @@ 47,GD00X,GD_V1,GD_V2 48,V761 49,KF606 -50,REDPINE,FAST,SLOW -51,POTENSIC,A20 +50,Redpine,Fast,Slow +51,Potensic,A20 52,ZSX,280 -53,FLYZONE,FZ-410 +53,Flyzone,FZ-410 63,XN_DUMP,250K,1M,2M diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index c1ff289..bf5f678 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -44,9 +44,10 @@ #endif #endif -// Error if CHECK_FOR_BOOTLOADER is enabled but the 'Flash from TX' bootloader +// Warning if CHECK_FOR_BOOTLOADER is enabled but no 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." + #undef CHECK_FOR_BOOTLOADER + #warning "Disabling CHECK_FOR_BOOTLOADER since no bootloader is selected." #endif //Check number of banks diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index b1ea295..9b652f1 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -31,8 +31,8 @@ /*************************/ //Allow flashing multimodule directly with TX(erky9x or opentx maintenance mode) //Instructions:https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/blob/master/docs/Flash_from_Tx.md -//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 +//To disable this feature add "//" at the begining of 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 /*******************/