More consistency in CMake options to enable / disable modules

This commit is contained in:
Bertrand Songis
2019-08-29 10:22:19 +02:00
parent 84df065e70
commit 6d893c9ea4
23 changed files with 78 additions and 53 deletions
+1 -2
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
+1 -1
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
+1 -1
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
+2 -2
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;
}