Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-22 07:45:12 +03:00
Code Activity

More consistency in CMake options to enable / disable modules

Browse source
This commit is contained in:
Bertrand Songis 2019-08-29 10:22:19 +02:00
parent 84df065e70
commit 6d893c9ea4
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
23 changed files with 78 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

23
radio/src/CMakeLists.txt
View file

@ -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})

3
radio/src/gui/128x64/model_setup.cpp
View file

@ -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

2
radio/src/gui/212x64/model_setup.cpp
View file

@ -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

2
radio/src/gui/480x272/model_setup.cpp
View file

@ -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

4
radio/src/gui/gui_common.cpp
View file

@ -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;
}

4
radio/src/options.h
View file

@ -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)

5
radio/src/targets/common/arm/CMakeLists.txt
View file

@ -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)

2
radio/src/translations.cpp
View file

@ -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;

2
radio/src/translations.h
View file

@ -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[];

2
radio/src/translations/cz.h.txt
View file

@ -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."

2
radio/src/translations/de.h.txt
View file

@ -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"

2
radio/src/translations/en.h.txt
View file

@ -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"

2
radio/src/translations/es.h.txt
View file

@ -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"

2
radio/src/translations/fi.h.txt
View file

@ -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"

2
radio/src/translations/fr.h.txt
View file

@ -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é"

2
radio/src/translations/it.h.txt
View file

@ -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"

2
radio/src/translations/nl.h.txt
View file

@ -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"

2
radio/src/translations/pl.h.txt
View file

@ -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"

2
radio/src/translations/pt.h.txt
View file

@ -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"

2
radio/src/translations/se.h.txt
View file

@ -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"

2
radio/src/translations/untranslated.h
View file

@ -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 "

40
radio/util/fwoptions.py
View file

@ -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)
}

20
tools/build-frsky.py
View file

@ -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")