piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove FLEX options (and make it default)

Browse Source
This commit is contained in:
Raphael Coeffic
2021-11-28 21:03:59 +10:00
committed by Peter Feerick
parent 58d15c11ab
commit dc102f7d03
7 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+1 -2
View File
@@ -960,8 +960,7 @@ void menuModelSetup(event_t event)
g_model.moduleData[moduleIdx].subType,
MODULE_SUBTYPE_R9M_FCC,
MODULE_SUBTYPE_R9M_LAST,
EE_MODEL,
isR9MModeAvailable);
EE_MODEL);
if (checkIncDec_Ret) {
g_model.moduleData[moduleIdx].pxx.power = 0;
g_model.moduleData[moduleIdx].channelsStart = 0;
radio/src/gui/212x64/model_setup.cpp
+1 -2
View File
@@ -925,8 +925,7 @@ void menuModelSetup(event_t event)
#endif
else if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
g_model.moduleData[EXTERNAL_MODULE].subType = checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].subType,
MODULE_SUBTYPE_R9M_FCC, MODULE_SUBTYPE_R9M_LAST, EE_MODEL,
isR9MModeAvailable);
MODULE_SUBTYPE_R9M_FCC, MODULE_SUBTYPE_R9M_LAST, EE_MODEL);
}
#if defined(AFHDS3)
else if (isModuleAFHDS3(EXTERNAL_MODULE)) {
radio/src/gui/gui_common.cpp
-8
View File
@@ -531,14 +531,6 @@ bool isSourceAvailableInResetSpecialFunction(int index)
}
}
bool isR9MModeAvailable(int mode)
{
#if defined(MODULE_PROTOCOL_FLEX)
return true;
#else
return mode <= MODULE_SUBTYPE_R9M_EU;
#endif
}
#if defined(PXX2)
bool isPxx2IsrmChannelsCountAllowed(int channels)
radio/src/gui/gui_common.h
-1
View File
@@ -92,7 +92,6 @@ bool isSwitchAvailableInLogicalSwitches(int swtch);
bool isSwitchAvailableInCustomFunctions(int swtch);
bool isSwitchAvailableInMixes(int swtch);
bool isSwitchAvailableInTimers(int swtch);
bool isR9MModeAvailable(int mode);
bool isPxx2IsrmChannelsCountAllowed(int channels);
bool isModuleUsingSport(uint8_t moduleBay, uint8_t moduleType);
bool isTrainerUsingModuleBay();