Remove FLEX options (and make it default)
This commit is contained in:
committed by
Peter Feerick
parent
58d15c11ab
commit
dc102f7d03
@@ -50,7 +50,6 @@ option(NANO "Use nano newlib and binalloc")
|
|||||||
option(TEST_BUILD_WARNING "Warn this is a test build" OFF)
|
option(TEST_BUILD_WARNING "Warn this is a test build" OFF)
|
||||||
option(MODULE_PROTOCOL_FCC "Add support for FCC modules" ON)
|
option(MODULE_PROTOCOL_FCC "Add support for FCC modules" ON)
|
||||||
option(MODULE_PROTOCOL_LBT "Add support for EU/LBT 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(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(TBS_RELEASE "Used to build TBS released firmware" OFF)
|
option(TBS_RELEASE "Used to build TBS released firmware" OFF)
|
||||||
@@ -418,10 +417,6 @@ if(MODULE_PROTOCOL_LBT)
|
|||||||
add_definitions(-DMODULE_PROTOCOL_LBT)
|
add_definitions(-DMODULE_PROTOCOL_LBT)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MODULE_PROTOCOL_FLEX)
|
|
||||||
add_definitions(-DMODULE_PROTOCOL_FLEX)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(MODULE_PROTOCOL_D8)
|
if(MODULE_PROTOCOL_D8)
|
||||||
add_definitions(-DMODULE_PROTOCOL_D8)
|
add_definitions(-DMODULE_PROTOCOL_D8)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -960,8 +960,7 @@ void menuModelSetup(event_t event)
|
|||||||
g_model.moduleData[moduleIdx].subType,
|
g_model.moduleData[moduleIdx].subType,
|
||||||
MODULE_SUBTYPE_R9M_FCC,
|
MODULE_SUBTYPE_R9M_FCC,
|
||||||
MODULE_SUBTYPE_R9M_LAST,
|
MODULE_SUBTYPE_R9M_LAST,
|
||||||
EE_MODEL,
|
EE_MODEL);
|
||||||
isR9MModeAvailable);
|
|
||||||
if (checkIncDec_Ret) {
|
if (checkIncDec_Ret) {
|
||||||
g_model.moduleData[moduleIdx].pxx.power = 0;
|
g_model.moduleData[moduleIdx].pxx.power = 0;
|
||||||
g_model.moduleData[moduleIdx].channelsStart = 0;
|
g_model.moduleData[moduleIdx].channelsStart = 0;
|
||||||
|
|||||||
@@ -925,8 +925,7 @@ void menuModelSetup(event_t event)
|
|||||||
#endif
|
#endif
|
||||||
else if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
|
else if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
|
||||||
g_model.moduleData[EXTERNAL_MODULE].subType = checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].subType,
|
g_model.moduleData[EXTERNAL_MODULE].subType = checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].subType,
|
||||||
MODULE_SUBTYPE_R9M_FCC, MODULE_SUBTYPE_R9M_LAST, EE_MODEL,
|
MODULE_SUBTYPE_R9M_FCC, MODULE_SUBTYPE_R9M_LAST, EE_MODEL);
|
||||||
isR9MModeAvailable);
|
|
||||||
}
|
}
|
||||||
#if defined(AFHDS3)
|
#if defined(AFHDS3)
|
||||||
else if (isModuleAFHDS3(EXTERNAL_MODULE)) {
|
else if (isModuleAFHDS3(EXTERNAL_MODULE)) {
|
||||||
|
|||||||
@@ -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)
|
#if defined(PXX2)
|
||||||
bool isPxx2IsrmChannelsCountAllowed(int channels)
|
bool isPxx2IsrmChannelsCountAllowed(int channels)
|
||||||
|
|||||||
@@ -92,7 +92,6 @@ bool isSwitchAvailableInLogicalSwitches(int swtch);
|
|||||||
bool isSwitchAvailableInCustomFunctions(int swtch);
|
bool isSwitchAvailableInCustomFunctions(int swtch);
|
||||||
bool isSwitchAvailableInMixes(int swtch);
|
bool isSwitchAvailableInMixes(int swtch);
|
||||||
bool isSwitchAvailableInTimers(int swtch);
|
bool isSwitchAvailableInTimers(int swtch);
|
||||||
bool isR9MModeAvailable(int mode);
|
|
||||||
bool isPxx2IsrmChannelsCountAllowed(int channels);
|
bool isPxx2IsrmChannelsCountAllowed(int channels);
|
||||||
bool isModuleUsingSport(uint8_t moduleBay, uint8_t moduleType);
|
bool isModuleUsingSport(uint8_t moduleBay, uint8_t moduleType);
|
||||||
bool isTrainerUsingModuleBay();
|
bool isTrainerUsingModuleBay();
|
||||||
|
|||||||
@@ -44,9 +44,6 @@ static const char * const options[] = {
|
|||||||
#if defined(FAI_CHOICE)
|
#if defined(FAI_CHOICE)
|
||||||
"FAIchoice",
|
"FAIchoice",
|
||||||
#endif
|
#endif
|
||||||
#if defined(MODULE_PROTOCOL_FLEX)
|
|
||||||
"flexr9m",
|
|
||||||
#endif
|
|
||||||
#if defined(AFHDS3)
|
#if defined(AFHDS3)
|
||||||
"afhds3",
|
"afhds3",
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -93,11 +93,7 @@
|
|||||||
#define LEN_CRSF_BAUDRATE "\005"
|
#define LEN_CRSF_BAUDRATE "\005"
|
||||||
#define TR_CRSF_BAUDRATE "115k\0""400k\0""921k\0""1.87M""3.75M""5.25M"
|
#define TR_CRSF_BAUDRATE "115k\0""400k\0""921k\0""1.87M""3.75M""5.25M"
|
||||||
|
|
||||||
#if defined(MODULE_PROTOCOL_FLEX)
|
|
||||||
#define TR_MODULE_R9M_LITE "R9ML\0 "
|
|
||||||
#else
|
|
||||||
#define TR_MODULE_R9M_LITE "R9MLite\0 "
|
#define TR_MODULE_R9M_LITE "R9MLite\0 "
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#if defined(BOLD)
|
#if defined(BOLD)
|
||||||
|
|||||||
Reference in New Issue
Block a user