From 84df065e7062e4e63a71f4c474e37dbfaee1b7d7 Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 29 Aug 2019 08:22:15 +0200 Subject: [PATCH 1/3] Improve pack generation --- tools/nightly23/build-sdcard.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/nightly23/build-sdcard.sh b/tools/nightly23/build-sdcard.sh index 81b4c209f..14e5550f5 100755 --- a/tools/nightly23/build-sdcard.sh +++ b/tools/nightly23/build-sdcard.sh @@ -62,6 +62,11 @@ else cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/sdcard/sdcard-taranis-x9-${sdcard_version}.zip * cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/sdcard/sdcard-taranis-x7-${sdcard_version}.zip * + # Create symlinks for other radios + ln -s ${output}/sdcard/sdcard-taranis-x7-${sdcard_version}.zip ${output}/sdcard/sdcard-taranis-xlite-${sdcard_version}.zip + ln -s ${output}/sdcard/sdcard-taranis-x7-${sdcard_version}.zip ${output}/sdcard/sdcard-taranis-x9lite-${sdcard_version}.zip + ln -s ${output}/sdcard/sdcard-taranis-x7-${sdcard_version}.zip ${output}/sdcard/sdcard-jumper-t12-${sdcard_version}.zip + # remove LUA stuff for 9x platform rm -Rf ${workdir}/sdcard/taranis-x7/SCRIPTS rm -Rf ${workdir}/sdcard/taranis-x7/FrSky-utilities From 6d893c9ea472a0a5931841fa5ad323f5a93fc59f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 29 Aug 2019 10:22:19 +0200 Subject: [PATCH 2/3] More consistency in CMake options to enable / disable modules --- radio/src/CMakeLists.txt | 23 +++++++++--- radio/src/gui/128x64/model_setup.cpp | 3 +- radio/src/gui/212x64/model_setup.cpp | 2 +- radio/src/gui/480x272/model_setup.cpp | 2 +- radio/src/gui/gui_common.cpp | 4 +-- radio/src/options.h | 4 +-- radio/src/targets/common/arm/CMakeLists.txt | 5 --- radio/src/translations.cpp | 2 +- radio/src/translations.h | 2 +- radio/src/translations/cz.h.txt | 2 +- radio/src/translations/de.h.txt | 2 +- radio/src/translations/en.h.txt | 2 +- radio/src/translations/es.h.txt | 2 +- radio/src/translations/fi.h.txt | 2 +- radio/src/translations/fr.h.txt | 2 +- radio/src/translations/it.h.txt | 2 +- radio/src/translations/nl.h.txt | 2 +- radio/src/translations/pl.h.txt | 2 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- radio/src/translations/untranslated.h | 2 +- radio/util/fwoptions.py | 40 ++++++++++----------- tools/build-frsky.py | 20 +++++++++-- 23 files changed, 78 insertions(+), 53 deletions(-) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 1b2191022..39b1b5876 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -47,7 +47,10 @@ option(TRACE_LUA_INTERNALS "Turn on traces for Lua internals" OFF) option(FRSKY_STICKS "Reverse sticks for FrSky sticks" OFF) option(NANO "Use nano newlib and binalloc") option(NIGHTLY_BUILD_WARNING "Warn this is a nightly build" OFF) -option(R9M_PROTO_FLEX "Add R9M options for non certified firmwwares" OFF) +option(MODULE_PROTOCOL_FCC "Add support for FCC modules" ON) +option(MODULE_PROTOCOL_LBT "Add support for EU/LBT modules" ON) +option(MODULE_PROTOCOL_FLEX "Add support for non certified FLEX modules" OFF) +option(MODULE_PROTOCOL_D8 "Add support for D8 modules" ON) option(FRSKY_RELEASE "Used to build FrSky released firmware" OFF) # since we reset all default CMAKE compiler flags for firmware builds, provide an alternate way for user to specify additional flags. @@ -309,13 +312,25 @@ if(NIGHTLY_BUILD_WARNING) add_definitions(-DNIGHTLY_BUILD_WARNING) endif() -if(R9M_PROTO_FLEX) - add_definitions(-DR9M_PROTO_FLEX) +if(MODULE_PROTOCOL_FCC) + add_definitions(-DMODULE_PROTOCOL_FCC) +endif() + +if(MODULE_PROTOCOL_LBT) + add_definitions(-DMODULE_PROTOCOL_LBT) +endif() + +if(MODULE_PROTOCOL_FLEX) + add_definitions(-DMODULE_PROTOCOL_FLEX) +endif() + +if(MODULE_PROTOCOL_D8) + add_definitions(-DMODULE_PROTOCOL_D8) endif() if(FRSKY_RELEASE) add_definitions(-DFRSKY_RELEASE) - set(POPUP_LEVEL 3) + set(POPUP_LEVEL 3) endif() add_definitions(-DPOPUP_LEVEL=${POPUP_LEVEL}) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 6e8709dea..e7a838619 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -905,7 +905,7 @@ void menuModelSetup(event_t event) else if (old_editMode > 0) { if (isModuleR9MNonAccess(EXTERNAL_MODULE)) { if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) { - POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1); + POPUP_WARNING(STR_MODULE_PROTOCOL_FLEX_WARN_LINE1); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); } #if POPUP_LEVEL >= 3 @@ -1486,7 +1486,6 @@ void menuModelSetup(event_t event) if (attr) { CHECK_INCDEC_MODELVAR_ZERO(event, module.pxx.power, R9M_LBT_POWER_MAX); if (s_editMode == 0 && reusableBuffer.moduleSetup.r9mPower != module.pxx.power) { - TRACE("ON Y PASSE"); module.channelsStart = 0; module.channelsCount = maxModuleChannels_M8(moduleIdx); if (reusableBuffer.moduleSetup.r9mPower + module.pxx.power < 5) { //switching between mode 2 and 3 does not require rebind diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 8b933dfbb..9490cf21b 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -906,7 +906,7 @@ void menuModelSetup(event_t event) else if (old_editMode > 0) { if (isModuleR9MNonAccess(EXTERNAL_MODULE)) { if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) { - POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1); + POPUP_WARNING(STR_MODULE_PROTOCOL_FLEX_WARN_LINE1); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); } #if POPUP_LEVEL >= 3 diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index ac6f03bd0..4fb07fb1c 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -1084,7 +1084,7 @@ bool menuModelSetup(event_t event) else if (old_editMode > 0) { if (isModuleR9MNonAccess(EXTERNAL_MODULE)) { if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) { - POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1); + POPUP_WARNING(STR_MODULE_PROTOCOL_FLEX_WARN_LINE1); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0); } #if POPUP_LEVEL >= 3 diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index c3ec84d09..d2bc265e2 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -515,7 +515,7 @@ bool isSourceAvailableInResetSpecialFunction(int index) bool isR9MModeAvailable(int mode) { -#if defined(R9M_PROTO_FLEX) +#if defined(MODULE_PROTOCOL_FLEX) return true; #else return mode <= MODULE_SUBTYPE_R9M_EU; @@ -660,7 +660,7 @@ bool isRfProtocolAvailable(int protocol) return false; } #endif -#if defined(MODULE_D16_EU_ONLY_SUPPORT) +#if !defined(MODULE_PROTOCOL_D8) if (protocol == MODULE_SUBTYPE_PXX1_ACCST_D8) { return false; } diff --git a/radio/src/options.h b/radio/src/options.h index ae0522b73..1038af319 100644 --- a/radio/src/options.h +++ b/radio/src/options.h @@ -29,7 +29,7 @@ static const char * options[] = { #if defined(CROSSFIRE) "crossfire", #endif -#if defined(MODULE_D16_EU_ONLY_SUPPORT) +#if !defined(MODULE_PROTOCOL_D8) "eu", #endif #if defined(FAI) @@ -38,7 +38,7 @@ static const char * options[] = { #if defined(FAI_CHOICE) "faichoice", #endif -#if defined(R9M_PROTO_FLEX) +#if defined(MODULE_PROTOCOL_FLEX) "flexr9m", #endif #if !defined(GVARS) diff --git a/radio/src/targets/common/arm/CMakeLists.txt b/radio/src/targets/common/arm/CMakeLists.txt index d07988221..4f2185da2 100644 --- a/radio/src/targets/common/arm/CMakeLists.txt +++ b/radio/src/targets/common/arm/CMakeLists.txt @@ -14,7 +14,6 @@ option(DSM2 "DSM2 TX Module" ON) option(SBUS "SBUS TX Module" ON) option(CROSSFIRE "Crossfire TX Module" ON) option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" ON) -option(SUPPORT_D16_EU_ONLY "XJT module only supports D16-EU and LR12-EU" OFF) # TODO rename to XJT_EU_ONLY option(DEBUG_INTERRUPTS "Count interrupts" OFF) option(DEBUG_LATENCY "Debug latency" OFF) option(DEBUG_USB_INTERRUPTS "Count individual USB interrupts" OFF) @@ -98,10 +97,6 @@ if(DEBUG) add_definitions(-DDEBUG) endif() -if(SUPPORT_D16_EU_ONLY) - add_definitions(-DMODULE_D16_EU_ONLY_SUPPORT) -endif() - if(HAPTIC) add_definitions(-DHAPTIC) set(SRC ${SRC} haptic.cpp) diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index fa6c6bade..665697fe3 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -456,7 +456,7 @@ const char STR_CHANNELRANGE[] = TR_CHANNELRANGE; const char STR_ANTENNASELECTION[] = TR_ANTENNASELECTION; const char STR_ANTENNACONFIRM1[] = TR_ANTENNACONFIRM1; const char STR_ANTENNACONFIRM2[] = TR_ANTENNACONFIRM2; -const char STR_R9M_PROTO_FLEX_WARN_LINE1[] = TR_R9M_PROTO_FLEX_WARN_LINE1; +const char STR_MODULE_PROTOCOL_FLEX_WARN_LINE1[] = TR_MODULE_PROTOCOL_FLEX_WARN_LINE1; const char STR_R9M_PROTO_FCC_WARN_LINE1[] = TR_R9M_PROTO_FCC_WARN_LINE1; const char STR_R9M_PROTO_EU_WARN_LINE1[] = TR_R9M_PROTO_EU_WARN_LINE1; const char STR_R9M_PROTO_WARN_LINE2[] = TR_R9M_PROTO_WARN_LINE2; diff --git a/radio/src/translations.h b/radio/src/translations.h index a51fedded..4cdcdec34 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -731,7 +731,7 @@ extern const char STR_CHANNELRANGE[]; extern const char STR_ANTENNASELECTION[]; extern const char STR_ANTENNACONFIRM1[]; extern const char STR_ANTENNACONFIRM2[]; -extern const char STR_R9M_PROTO_FLEX_WARN_LINE1[]; +extern const char STR_MODULE_PROTOCOL_FLEX_WARN_LINE1[]; extern const char STR_R9M_PROTO_FCC_WARN_LINE1[]; extern const char STR_R9M_PROTO_EU_WARN_LINE1[]; extern const char STR_R9M_PROTO_WARN_LINE2[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 5a8192525..fe75b5504 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -946,7 +946,7 @@ #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Volba antény") #define TR_ANTENNACONFIRM1 "Opravdu přepnout?" #define TR_ANTENNACONFIRM2 TR("Zkont. anténu", "Ujisti se že je anténa připojena!") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Vyžaduje FLEX" +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Vyžaduje FLEX" #define TR_R9M_PROTO_FCC_WARN_LINE1 "Vyžaduje FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Vyžaduje EU" #define TR_R9M_PROTO_WARN_LINE2 "firmware." diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index c483aaf0a..fc51c6efd 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -957,7 +957,7 @@ #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenne auswählen") #define TR_ANTENNACONFIRM1 "Ant. umschalten" #define TR_ANTENNACONFIRM2 TR("Check antenna", "Ist eine externe Antenne installiert?") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Requires non" +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Requires non" #define TR_R9M_PROTO_FCC_WARN_LINE1 "Requires FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 0442da53c..52f8bf834 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -952,7 +952,7 @@ #define TR_ANTENNASELECTION TR(INDENT "Antenna", TR(INDENT "Antenna", INDENT "Antenna selection")) #define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Requires FLEX non" +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Requires FLEX non" #define TR_R9M_PROTO_FCC_WARN_LINE1 "Requires FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 22864e0b7..1fc6e765e 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -972,7 +972,7 @@ #define TR_ANTENNASELECTION TR(INDENT "Antenna", TR(INDENT "Antenna", INDENT "Antenna selection")) #define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Requires non" +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Requires non" #define TR_R9M_PROTO_FCC_WARN_LINE1 "Requires FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index b4d2948f0..a8d3ad998 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -965,7 +965,7 @@ #define TR_ANTENNASELECTION TR(INDENT "Antenna", TR(INDENT "Antenna", INDENT "Antenna selection")) #define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Requires non" +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Requires non" #define TR_R9M_PROTO_FCC_WARN_LINE1 "Requires FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 68c4c739f..fd832abbf 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -967,7 +967,7 @@ #define TR_ANTENNASELECTION TR(INDENT "Antenne", INDENT "Choix antenne") #define TR_ANTENNACONFIRM1 "Vraiment changer?" #define TR_ANTENNACONFIRM2 TR("Vérif antenne", "Installer l'antenne d'abord!") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Nécessite firm." +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Nécessite firm." #define TR_R9M_PROTO_FCC_WARN_LINE1 "Requires FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_WARN_LINE2 "R9M non certifié" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index e529780f5..9576afad1 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -966,7 +966,7 @@ #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection") #define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Requires non" +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Requires non" #define TR_R9M_PROTO_FCC_WARN_LINE1 "Requires FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 4546754e7..7de762f2e 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -954,7 +954,7 @@ TR_GYR_VSRCRAW #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection") #define TR_ANTENNACONFIRM1 "Antennes wisselen?" #define TR_ANTENNACONFIRM2 TR("Check antenna", "Is er zeker een antenne geplaatst!") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Requires non" +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Requires non" #define TR_R9M_PROTO_FCC_WARN_LINE1 "Requires FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index f89f0fdca..456d274b8 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -966,7 +966,7 @@ #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection") #define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Requires non" +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Requires non" #define TR_R9M_PROTO_FCC_WARN_LINE1 "Requires FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index dba497fb6..a5165ec23 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -956,7 +956,7 @@ #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection") #define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Requires non" +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Requires non" #define TR_R9M_PROTO_FCC_WARN_LINE1 "Requires FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 13667aacb..a7df7ee5b 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -966,7 +966,7 @@ #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection") #define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") -#define TR_R9M_PROTO_FLEX_WARN_LINE1 "Requires non" +#define TR_MODULE_PROTOCOL_FLEX_WARN_LINE1 "Requires non" #define TR_R9M_PROTO_FCC_WARN_LINE1 "Requires FCC" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware" diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h index eec7706d5..34022903b 100644 --- a/radio/src/translations/untranslated.h +++ b/radio/src/translations/untranslated.h @@ -85,7 +85,7 @@ #define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS TR_GYR_VSRCRAW "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW -#if defined(R9M_PROTO_FLEX) +#if defined(MODULE_PROTOCOL_FLEX) #define TR_MODULE_R9M_LITE "R9ML\0 " #else #define TR_MODULE_R9M_LITE "R9MLite\0 " diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py index da8041bc7..e9dea65e3 100755 --- a/radio/util/fwoptions.py +++ b/radio/util/fwoptions.py @@ -40,7 +40,7 @@ options_sky9x = { "faimode": ("FAI", "YES", None), "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None) + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) } options_ar9x = { @@ -61,7 +61,7 @@ options_ar9x = { "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), # "rtc": ("RTCLOCK", "YES", "NO"), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None) + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) } options_taranis_x9d = { @@ -76,8 +76,8 @@ options_taranis_x9d = { "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), - "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None) + "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"), + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) } options_taranis_x9dp = { @@ -92,8 +92,8 @@ options_taranis_x9dp = { "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), - "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None) + "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"), + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) } options_taranis_x9lite = { @@ -108,9 +108,9 @@ options_taranis_x9lite = { "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), - "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), + "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"), "internalpxx1": ("INTERNAL_MODULE_PXX1", "YES", "NO"), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None) + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) } options_taranis_xlite = { @@ -123,8 +123,8 @@ options_taranis_xlite = { "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), - "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None) + "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"), + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) } options_taranis_xlites = { @@ -138,9 +138,9 @@ options_taranis_xlites = { "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), - "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), + "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"), "internalpxx1": ("INTERNAL_MODULE_PXX1", "YES", "NO"), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None) + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) } options_taranis_x9e = { @@ -154,9 +154,9 @@ options_taranis_x9e = { "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), - "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), + "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"), "horussticks": ("STICKS", "HORUS", "STANDARD"), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None) + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) } options_horus_x12s = { @@ -167,9 +167,9 @@ options_horus_x12s = { "faimode": ("FAI", "YES", None), "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), - "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), + "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"), "pcbdev": ("PCBREV", "10", None), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None), + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None), "internalaccess": [("INTERNAL_MODULE_PXX1", "NO", None), ("INTERNAL_MODULE_PXX2", "YES", None)] } @@ -181,8 +181,8 @@ options_horus_x10 = { "faimode": ("FAI", "YES", None), "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), - "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None), + "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"), + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None), "internalaccess": [("INTERNAL_MODULE_PXX1", "NO", None), ("INTERNAL_MODULE_PXX2", "YES", None)] } @@ -195,6 +195,6 @@ options_horus_x10express = { "faimode": ("FAI", "YES", None), "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), - "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), - "flexr9m": ("R9M_PROTO_FLEX", "YES", None) + "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"), + "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) } diff --git a/tools/build-frsky.py b/tools/build-frsky.py index f08ee39d3..d07c0a3ee 100755 --- a/tools/build-frsky.py +++ b/tools/build-frsky.py @@ -9,7 +9,20 @@ import tempfile options = { - "XLITE": { + "XLITE_FCC": { + "PCB": "XLITE", + "LUA": "NO_MODEL_SCRIPTS", + "GVARS": "YES", + "MODULE_SIZE_STD": "NO", + "PPM": "NO", + "DSM2": "NO", + "MULTIMODULE": "NO", + "CROSSFIRE": "NO", + "SBUS": "NO", + }, + "XLITE_LBT": { + "PCB": "XLITE", + "MODULE_PROTOCOL_D8": "NO", "LUA": "NO_MODEL_SCRIPTS", "GVARS": "YES", "MODULE_SIZE_STD": "NO", @@ -20,6 +33,7 @@ options = { "SBUS": "NO", }, "XLITES": { + "PCB": "XLITES", "LUA": "NO_MODEL_SCRIPTS", "GVARS": "YES", "AUTOUPDATE": "YES", @@ -33,6 +47,7 @@ options = { "SBUS": "NO", }, "X9LITE": { + "PCB": "X9LITE", "LUA": "NO_MODEL_SCRIPTS", "GVARS": "YES", "AUTOUPDATE": "YES", @@ -47,6 +62,7 @@ options = { "DEFAULT_MODE": "2", }, "X9D+": { + "PCB": "X9D+", "PCBREV": "2019", "LUA": "NO_MODEL_SCRIPTS", "GVARS": "YES", @@ -70,7 +86,7 @@ def build(board, srcdir): os.mkdir("output") path = tempfile.mkdtemp() os.chdir(path) - command = "cmake -DPCB=%s %s -DFRSKY_RELEASE=YES %s" % (board, cmake_options, srcdir) + command = "cmake -DFRSKY_RELEASE=YES %s" % (board, cmake_options, srcdir) print(command) os.system(command) os.system("make firmware -j6") From 52624710cd005b71d5e2a77eccc737eb4d7a34a9 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 29 Aug 2019 10:47:23 +0200 Subject: [PATCH 3/3] Update script compilation FrSky --- tools/build-frsky.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/build-frsky.py b/tools/build-frsky.py index d07c0a3ee..699049f2f 100755 --- a/tools/build-frsky.py +++ b/tools/build-frsky.py @@ -86,7 +86,7 @@ def build(board, srcdir): os.mkdir("output") path = tempfile.mkdtemp() os.chdir(path) - command = "cmake -DFRSKY_RELEASE=YES %s" % (board, cmake_options, srcdir) + command = "cmake %s -DFRSKY_RELEASE=YES %s" % (cmake_options, srcdir) print(command) os.system(command) os.system("make firmware -j6") @@ -115,7 +115,9 @@ def main(): parser.add_argument("srcdir", type=dir_path) args = parser.parse_args() - for board in args.boards: + + boards = options.keys() if "ALL" in args.boards else args.boards + for board in boards: build(board, args.srcdir)