Merge with 2.3

This commit is contained in:
Bertrand Songis
2019-08-29 11:06:31 +02:00
24 changed files with 89 additions and 57 deletions
+19 -4
View File
@@ -48,7 +48,10 @@ option(DEBUG_WINDOWS "Turn on windows traces" OFF)
option(FRSKY_STICKS "Reverse sticks for FrSky sticks" OFF) option(FRSKY_STICKS "Reverse sticks for FrSky sticks" OFF)
option(NANO "Use nano newlib and binalloc") option(NANO "Use nano newlib and binalloc")
option(NIGHTLY_BUILD_WARNING "Warn this is a nightly build" OFF) 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) option(FRSKY_RELEASE "Used to build FrSky released firmware" OFF)
option(BOOTLOADER "Include Bootloader" ON) option(BOOTLOADER "Include Bootloader" ON)
@@ -320,13 +323,25 @@ if(NIGHTLY_BUILD_WARNING)
add_definitions(-DNIGHTLY_BUILD_WARNING) add_definitions(-DNIGHTLY_BUILD_WARNING)
endif() endif()
if(R9M_PROTO_FLEX) if(MODULE_PROTOCOL_FCC)
add_definitions(-DR9M_PROTO_FLEX) 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() endif()
if(FRSKY_RELEASE) if(FRSKY_RELEASE)
add_definitions(-DFRSKY_RELEASE) add_definitions(-DFRSKY_RELEASE)
set(POPUP_LEVEL 3) set(POPUP_LEVEL 3)
endif() endif()
add_definitions(-DPOPUP_LEVEL=${POPUP_LEVEL}) add_definitions(-DPOPUP_LEVEL=${POPUP_LEVEL})
+1 -2
View File
@@ -909,7 +909,7 @@ void menuModelSetup(event_t event)
else if (old_editMode > 0) { else if (old_editMode > 0) {
if (isModuleR9MNonAccess(EXTERNAL_MODULE)) { if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) { 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); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
} }
#if POPUP_LEVEL >= 3 #if POPUP_LEVEL >= 3
@@ -1490,7 +1490,6 @@ void menuModelSetup(event_t event)
if (attr) { if (attr) {
CHECK_INCDEC_MODELVAR_ZERO(event, module.pxx.power, R9M_LBT_POWER_MAX); CHECK_INCDEC_MODELVAR_ZERO(event, module.pxx.power, R9M_LBT_POWER_MAX);
if (s_editMode == 0 && reusableBuffer.moduleSetup.r9mPower != module.pxx.power) { if (s_editMode == 0 && reusableBuffer.moduleSetup.r9mPower != module.pxx.power) {
TRACE("ON Y PASSE");
module.channelsStart = 0; module.channelsStart = 0;
module.channelsCount = maxModuleChannels_M8(moduleIdx); module.channelsCount = maxModuleChannels_M8(moduleIdx);
if (reusableBuffer.moduleSetup.r9mPower + module.pxx.power < 5) { //switching between mode 2 and 3 does not require rebind if (reusableBuffer.moduleSetup.r9mPower + module.pxx.power < 5) { //switching between mode 2 and 3 does not require rebind
+1 -1
View File
@@ -906,7 +906,7 @@ void menuModelSetup(event_t event)
else if (old_editMode > 0) { else if (old_editMode > 0) {
if (isModuleR9MNonAccess(EXTERNAL_MODULE)) { if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) { 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); SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
} }
#if POPUP_LEVEL >= 3 #if POPUP_LEVEL >= 3
+4 -4
View File
@@ -169,7 +169,7 @@ void RadioToolsPage::rebuild(FormWindow * window)
#if defined(PXX2) #if defined(PXX2)
// PXX2 modules tools // PXX2 modules tools
if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) { if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) {
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED); new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED);
new TextButton(window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_INT, [=]() -> uint8_t { new TextButton(window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_INT, [=]() -> uint8_t {
new RadioSpectrumAnalyser(INTERNAL_MODULE); new RadioSpectrumAnalyser(INTERNAL_MODULE);
@@ -178,7 +178,7 @@ void RadioToolsPage::rebuild(FormWindow * window)
grid.nextLine(); grid.nextLine();
} }
if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) { if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) {
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED); new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED);
new TextButton(window, grid.getFieldSlot(1), STR_POWER_METER_INT, [=]() -> uint8_t { new TextButton(window, grid.getFieldSlot(1), STR_POWER_METER_INT, [=]() -> uint8_t {
// new RadioPowerMeter(INTERNAL_MODULE); // new RadioPowerMeter(INTERNAL_MODULE);
@@ -187,7 +187,7 @@ void RadioToolsPage::rebuild(FormWindow * window)
grid.nextLine(); grid.nextLine();
} }
if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) { if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) {
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED); new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED);
new TextButton(window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_EXT, [=]() -> uint8_t { new TextButton(window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_EXT, [=]() -> uint8_t {
new RadioSpectrumAnalyser(EXTERNAL_MODULE); new RadioSpectrumAnalyser(EXTERNAL_MODULE);
@@ -196,7 +196,7 @@ void RadioToolsPage::rebuild(FormWindow * window)
grid.nextLine(); grid.nextLine();
} }
if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) { if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) {
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED); new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED);
new TextButton(window, grid.getFieldSlot(1), STR_POWER_METER_EXT, [=]() -> uint8_t { new TextButton(window, grid.getFieldSlot(1), STR_POWER_METER_EXT, [=]() -> uint8_t {
// new RadioPowerMeter(EXTERNAL_MODULE); // new RadioPowerMeter(EXTERNAL_MODULE);
+2 -2
View File
@@ -505,7 +505,7 @@ bool isSourceAvailableInResetSpecialFunction(int index)
bool isR9MModeAvailable(int mode) bool isR9MModeAvailable(int mode)
{ {
#if defined(R9M_PROTO_FLEX) #if defined(MODULE_PROTOCOL_FLEX)
return true; return true;
#else #else
return mode <= MODULE_SUBTYPE_R9M_EU; return mode <= MODULE_SUBTYPE_R9M_EU;
@@ -650,7 +650,7 @@ bool isRfProtocolAvailable(int protocol)
return false; return false;
} }
#endif #endif
#if defined(MODULE_D16_EU_ONLY_SUPPORT) #if !defined(MODULE_PROTOCOL_D8)
if (protocol == MODULE_SUBTYPE_PXX1_ACCST_D8) { if (protocol == MODULE_SUBTYPE_PXX1_ACCST_D8) {
return false; return false;
} }
+2 -2
View File
@@ -29,7 +29,7 @@ static const char * options[] = {
#if defined(CROSSFIRE) #if defined(CROSSFIRE)
"crossfire", "crossfire",
#endif #endif
#if defined(MODULE_D16_EU_ONLY_SUPPORT) #if !defined(MODULE_PROTOCOL_D8)
"eu", "eu",
#endif #endif
#if defined(FAI) #if defined(FAI)
@@ -38,7 +38,7 @@ static const char * options[] = {
#if defined(FAI_CHOICE) #if defined(FAI_CHOICE)
"faichoice", "faichoice",
#endif #endif
#if defined(R9M_PROTO_FLEX) #if defined(MODULE_PROTOCOL_FLEX)
"flexr9m", "flexr9m",
#endif #endif
#if !defined(GVARS) #if !defined(GVARS)
@@ -14,7 +14,6 @@ option(DSM2 "DSM2 TX Module" ON)
option(SBUS "SBUS TX Module" ON) option(SBUS "SBUS TX Module" ON)
option(CROSSFIRE "Crossfire 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(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_INTERRUPTS "Count interrupts" OFF)
option(DEBUG_LATENCY "Debug latency" OFF) option(DEBUG_LATENCY "Debug latency" OFF)
option(DEBUG_USB_INTERRUPTS "Count individual USB interrupts" OFF) option(DEBUG_USB_INTERRUPTS "Count individual USB interrupts" OFF)
@@ -98,10 +97,6 @@ if(DEBUG)
add_definitions(-DDEBUG) add_definitions(-DDEBUG)
endif() endif()
if(SUPPORT_D16_EU_ONLY)
add_definitions(-DMODULE_D16_EU_ONLY_SUPPORT)
endif()
if(HAPTIC) if(HAPTIC)
add_definitions(-DHAPTIC) add_definitions(-DHAPTIC)
set(SRC ${SRC} haptic.cpp) set(SRC ${SRC} haptic.cpp)
+1 -1
View File
@@ -461,7 +461,7 @@ const char STR_CHANNELRANGE[] = TR_CHANNELRANGE;
const char STR_ANTENNASELECTION[] = TR_ANTENNASELECTION; const char STR_ANTENNASELECTION[] = TR_ANTENNASELECTION;
const char STR_ANTENNACONFIRM1[] = TR_ANTENNACONFIRM1; const char STR_ANTENNACONFIRM1[] = TR_ANTENNACONFIRM1;
const char STR_ANTENNACONFIRM2[] = TR_ANTENNACONFIRM2; 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_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_EU_WARN_LINE1[] = TR_R9M_PROTO_EU_WARN_LINE1;
const char STR_R9M_PROTO_WARN_LINE2[] = TR_R9M_PROTO_WARN_LINE2; const char STR_R9M_PROTO_WARN_LINE2[] = TR_R9M_PROTO_WARN_LINE2;
+1 -1
View File
@@ -741,7 +741,7 @@ extern const char STR_RXFREQUENCY[];
extern const char STR_ANTENNASELECTION[]; extern const char STR_ANTENNASELECTION[];
extern const char STR_ANTENNACONFIRM1[]; extern const char STR_ANTENNACONFIRM1[];
extern const char STR_ANTENNACONFIRM2[]; 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_FCC_WARN_LINE1[];
extern const char STR_R9M_PROTO_EU_WARN_LINE1[]; extern const char STR_R9M_PROTO_EU_WARN_LINE1[];
extern const char STR_R9M_PROTO_WARN_LINE2[]; extern const char STR_R9M_PROTO_WARN_LINE2[];
+1 -1
View File
@@ -947,7 +947,7 @@
#define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Volba antény") #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Volba antény")
#define TR_ANTENNACONFIRM1 "Opravdu přepnout?" #define TR_ANTENNACONFIRM1 "Opravdu přepnout?"
#define TR_ANTENNACONFIRM2 TR("Zkont. anténu", "Ujisti se že je anténa připojena!") #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_FCC_WARN_LINE1 "Vyžaduje FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Vyžaduje EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Vyžaduje EU"
#define TR_R9M_PROTO_WARN_LINE2 "firmware." #define TR_R9M_PROTO_WARN_LINE2 "firmware."
+1 -1
View File
@@ -969,7 +969,7 @@
#define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenne auswählen") #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenne auswählen")
#define TR_ANTENNACONFIRM1 "Ant. umschalten" #define TR_ANTENNACONFIRM1 "Ant. umschalten"
#define TR_ANTENNACONFIRM2 TR("Check antenna", "Ist eine externe Antenne installiert?") #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_FCC_WARN_LINE1 "Requires FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU"
#define TR_R9M_PROTO_WARN_LINE2 "certified firmware" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware"
+1 -1
View File
@@ -963,7 +963,7 @@
#define TR_ANTENNASELECTION TR(INDENT "Antenna", TR(INDENT "Antenna", INDENT "Antenna selection")) #define TR_ANTENNASELECTION TR(INDENT "Antenna", TR(INDENT "Antenna", INDENT "Antenna selection"))
#define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM1 "Really switch?"
#define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") #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_FCC_WARN_LINE1 "Requires FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU"
#define TR_R9M_PROTO_WARN_LINE2 "certified firmware" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware"
+1 -1
View File
@@ -984,7 +984,7 @@
#define TR_ANTENNASELECTION TR(INDENT "Antenna", TR(INDENT "Antenna", INDENT "Antenna selection")) #define TR_ANTENNASELECTION TR(INDENT "Antenna", TR(INDENT "Antenna", INDENT "Antenna selection"))
#define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM1 "Really switch?"
#define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") #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_FCC_WARN_LINE1 "Requires FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU"
#define TR_R9M_PROTO_WARN_LINE2 "certified firmware" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware"
+1 -1
View File
@@ -977,7 +977,7 @@
#define TR_ANTENNASELECTION TR(INDENT "Antenna", TR(INDENT "Antenna", INDENT "Antenna selection")) #define TR_ANTENNASELECTION TR(INDENT "Antenna", TR(INDENT "Antenna", INDENT "Antenna selection"))
#define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM1 "Really switch?"
#define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") #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_FCC_WARN_LINE1 "Requires FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU"
#define TR_R9M_PROTO_WARN_LINE2 "certified firmware" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware"
+1 -1
View File
@@ -979,7 +979,7 @@
#define TR_ANTENNASELECTION TR(INDENT "Antenne", INDENT "Choix antenne") #define TR_ANTENNASELECTION TR(INDENT "Antenne", INDENT "Choix antenne")
#define TR_ANTENNACONFIRM1 "Vraiment changer?" #define TR_ANTENNACONFIRM1 "Vraiment changer?"
#define TR_ANTENNACONFIRM2 TR("Vérif antenne", "Installer l'antenne d'abord!") #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_FCC_WARN_LINE1 "Requires FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU"
#define TR_R9M_PROTO_WARN_LINE2 "R9M non certifié" #define TR_R9M_PROTO_WARN_LINE2 "R9M non certifié"
+1 -1
View File
@@ -981,7 +981,7 @@
#define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection") #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection")
#define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM1 "Really switch?"
#define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") #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_FCC_WARN_LINE1 "Requires FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU"
#define TR_R9M_PROTO_WARN_LINE2 "certified firmware" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware"
+1 -1
View File
@@ -966,7 +966,7 @@ TR_GYR_VSRCRAW
#define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection") #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection")
#define TR_ANTENNACONFIRM1 "Antennes wisselen?" #define TR_ANTENNACONFIRM1 "Antennes wisselen?"
#define TR_ANTENNACONFIRM2 TR("Check antenna", "Is er zeker een antenne geplaatst!") #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_FCC_WARN_LINE1 "Requires FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU"
#define TR_R9M_PROTO_WARN_LINE2 "certified firmware" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware"
+1 -1
View File
@@ -978,7 +978,7 @@
#define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection") #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection")
#define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM1 "Really switch?"
#define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") #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_FCC_WARN_LINE1 "Requires FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU"
#define TR_R9M_PROTO_WARN_LINE2 "certified firmware" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware"
+1 -1
View File
@@ -968,7 +968,7 @@
#define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection") #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection")
#define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM1 "Really switch?"
#define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") #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_FCC_WARN_LINE1 "Requires FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU"
#define TR_R9M_PROTO_WARN_LINE2 "certified firmware" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware"
+1 -1
View File
@@ -978,7 +978,7 @@
#define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection") #define TR_ANTENNASELECTION TR(INDENT "Antenna", INDENT "Antenna selection")
#define TR_ANTENNACONFIRM1 "Really switch?" #define TR_ANTENNACONFIRM1 "Really switch?"
#define TR_ANTENNACONFIRM2 TR("Check antenna", "Make sure antenna is installed!") #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_FCC_WARN_LINE1 "Requires FCC"
#define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU" #define TR_R9M_PROTO_EU_WARN_LINE1 "Requires EU"
#define TR_R9M_PROTO_WARN_LINE2 "certified firmware" #define TR_R9M_PROTO_WARN_LINE2 "certified firmware"
+1 -1
View File
@@ -88,7 +88,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 #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 " #define TR_MODULE_R9M_LITE "R9ML\0 "
#else #else
#define TR_MODULE_R9M_LITE "R9MLite\0 " #define TR_MODULE_R9M_LITE "R9MLite\0 "
+20 -20
View File
@@ -40,7 +40,7 @@ options_sky9x = {
"faimode": ("FAI", "YES", None), "faimode": ("FAI", "YES", None),
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None) "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None)
} }
options_ar9x = { options_ar9x = {
@@ -61,7 +61,7 @@ options_ar9x = {
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
# "rtc": ("RTCLOCK", "YES", "NO"), # "rtc": ("RTCLOCK", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None) "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None)
} }
options_taranis_x9d = { options_taranis_x9d = {
@@ -76,8 +76,8 @@ options_taranis_x9d = {
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"), "internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None) "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None)
} }
options_taranis_x9dp = { options_taranis_x9dp = {
@@ -92,8 +92,8 @@ options_taranis_x9dp = {
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"), "internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None) "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None)
} }
options_taranis_x9lite = { options_taranis_x9lite = {
@@ -108,9 +108,9 @@ options_taranis_x9lite = {
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
"internalpxx1": ("INTERNAL_MODULE_PXX1", "YES", "NO"), "internalpxx1": ("INTERNAL_MODULE_PXX1", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None) "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None)
} }
options_taranis_xlite = { options_taranis_xlite = {
@@ -123,8 +123,8 @@ options_taranis_xlite = {
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None) "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None)
} }
options_taranis_xlites = { options_taranis_xlites = {
@@ -138,9 +138,9 @@ options_taranis_xlites = {
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
"internalpxx1": ("INTERNAL_MODULE_PXX1", "YES", "NO"), "internalpxx1": ("INTERNAL_MODULE_PXX1", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None) "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None)
} }
options_taranis_x9e = { options_taranis_x9e = {
@@ -154,9 +154,9 @@ options_taranis_x9e = {
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"), "internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
"horussticks": ("STICKS", "HORUS", "STANDARD"), "horussticks": ("STICKS", "HORUS", "STANDARD"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None) "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None)
} }
options_horus_x12s = { options_horus_x12s = {
@@ -167,9 +167,9 @@ options_horus_x12s = {
"faimode": ("FAI", "YES", None), "faimode": ("FAI", "YES", None),
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
"pcbdev": ("PCBREV", "10", None), "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)] "internalaccess": [("INTERNAL_MODULE_PXX1", "NO", None), ("INTERNAL_MODULE_PXX2", "YES", None)]
} }
@@ -181,8 +181,8 @@ options_horus_x10 = {
"faimode": ("FAI", "YES", None), "faimode": ("FAI", "YES", None),
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None), "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
"internalaccess": [("INTERNAL_MODULE_PXX1", "NO", None), ("INTERNAL_MODULE_PXX2", "YES", None)] "internalaccess": [("INTERNAL_MODULE_PXX1", "NO", None), ("INTERNAL_MODULE_PXX2", "YES", None)]
} }
@@ -195,6 +195,6 @@ options_horus_x10express = {
"faimode": ("FAI", "YES", None), "faimode": ("FAI", "YES", None),
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("MODULE_PROTOCOL_D8", "NO", "YES"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None) "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None)
} }
+21 -3
View File
@@ -9,7 +9,20 @@ import tempfile
options = { 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", "LUA": "NO_MODEL_SCRIPTS",
"GVARS": "YES", "GVARS": "YES",
"MODULE_SIZE_STD": "NO", "MODULE_SIZE_STD": "NO",
@@ -20,6 +33,7 @@ options = {
"SBUS": "NO", "SBUS": "NO",
}, },
"XLITES": { "XLITES": {
"PCB": "XLITES",
"LUA": "NO_MODEL_SCRIPTS", "LUA": "NO_MODEL_SCRIPTS",
"GVARS": "YES", "GVARS": "YES",
"AUTOUPDATE": "YES", "AUTOUPDATE": "YES",
@@ -33,6 +47,7 @@ options = {
"SBUS": "NO", "SBUS": "NO",
}, },
"X9LITE": { "X9LITE": {
"PCB": "X9LITE",
"LUA": "NO_MODEL_SCRIPTS", "LUA": "NO_MODEL_SCRIPTS",
"GVARS": "YES", "GVARS": "YES",
"AUTOUPDATE": "YES", "AUTOUPDATE": "YES",
@@ -47,6 +62,7 @@ options = {
"DEFAULT_MODE": "2", "DEFAULT_MODE": "2",
}, },
"X9D+": { "X9D+": {
"PCB": "X9D+",
"PCBREV": "2019", "PCBREV": "2019",
"LUA": "NO_MODEL_SCRIPTS", "LUA": "NO_MODEL_SCRIPTS",
"GVARS": "YES", "GVARS": "YES",
@@ -70,7 +86,7 @@ def build(board, srcdir):
os.mkdir("output") os.mkdir("output")
path = tempfile.mkdtemp() path = tempfile.mkdtemp()
os.chdir(path) os.chdir(path)
command = "cmake -DPCB=%s %s -DFRSKY_RELEASE=YES %s" % (board, cmake_options, srcdir) command = "cmake %s -DFRSKY_RELEASE=YES %s" % (cmake_options, srcdir)
print(command) print(command)
os.system(command) os.system(command)
os.system("make firmware -j6") os.system("make firmware -j6")
@@ -99,7 +115,9 @@ def main():
parser.add_argument("srcdir", type=dir_path) parser.add_argument("srcdir", type=dir_path)
args = parser.parse_args() 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) build(board, args.srcdir)
+5
View File
@@ -62,6 +62,11 @@ else
cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/sdcard/sdcard-taranis-x9-${sdcard_version}.zip * 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 * 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 # remove LUA stuff for 9x platform
rm -Rf ${workdir}/sdcard/taranis-x7/SCRIPTS rm -Rf ${workdir}/sdcard/taranis-x7/SCRIPTS
rm -Rf ${workdir}/sdcard/taranis-x7/FrSky-utilities rm -Rf ${workdir}/sdcard/taranis-x7/FrSky-utilities