From 75b382e6193037b9c1e361d4162e0a8b75515d2b Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 13 Dec 2017 12:51:01 +0100 Subject: [PATCH] Simply hide unavailable choices (#5509) --- radio/src/gui/128x64/model_setup.cpp | 11 ++++------- radio/src/gui/212x64/model_setup.cpp | 12 +++--------- radio/src/gui/480x272/model_setup.cpp | 12 +++--------- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 72be35e2c..1f3fc5f2f 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1024,20 +1024,17 @@ void menuModelSetup(event_t event) uint8_t default_selection; if (IS_MODULE_R9M_LBT(moduleIdx)) { POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_OFF); - POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_ON); + if (!IS_TELEMETRY_INTERNAL_MODULE()) + POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_500MW_CH1_8_TELEM_OFF); POPUP_MENU_ADD_ITEM(STR_BINDING_500MW_CH9_16_TELEM_OFF); default_selection = 2; } else { - if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) - POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); - else + if (!(IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)) POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_OFF); - if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) - POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); - else + if (!(IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)) POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_OFF); default_selection = g_model.moduleData[INTERNAL_MODULE].pxx.receiver_telem_off + (g_model.moduleData[INTERNAL_MODULE].pxx.receiver_channel_9_16 << 1); diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 04345f957..45a632b8f 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -1025,9 +1025,7 @@ void menuModelSetup(event_t event) if (event == EVT_KEY_BREAK(KEY_ENTER)) { uint8_t default_selection; if (IS_MODULE_R9M_LBT(moduleIdx)) { - if (IS_TELEMETRY_INTERNAL_MODULE()) - POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); - else + if (!IS_TELEMETRY_INTERNAL_MODULE()) POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_OFF); POPUP_MENU_ADD_ITEM(STR_BINDING_500MW_CH1_8_TELEM_OFF); @@ -1035,14 +1033,10 @@ void menuModelSetup(event_t event) default_selection = 1; } else { - if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) - POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); - else + if (!(IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)) POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_OFF); - if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) - POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); - else + if (!(IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)) POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_OFF); default_selection = g_model.moduleData[moduleIdx].pxx.receiver_telem_off + (g_model.moduleData[moduleIdx].pxx.receiver_channel_9_16 << 1); diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index 2d4a4de22..55042beae 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -927,9 +927,7 @@ bool menuModelSetup(event_t event) if (event == EVT_KEY_BREAK(KEY_ENTER)) { uint8_t default_selection; if (IS_MODULE_R9M_LBT(moduleIdx)) { - if (IS_TELEMETRY_INTERNAL_MODULE()) - POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); - else + if (!IS_TELEMETRY_INTERNAL_MODULE()) POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_25MW_CH1_8_TELEM_OFF); POPUP_MENU_ADD_ITEM(STR_BINDING_500MW_CH1_8_TELEM_OFF); @@ -937,14 +935,10 @@ bool menuModelSetup(event_t event) default_selection = 2; } else { - if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) - POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); - else + if (!(IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)) POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_OFF); - if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) - POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); - else + if (!(IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE)) POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_OFF); default_selection = g_model.moduleData[moduleIdx].pxx.receiver_telem_off + (g_model.moduleData[moduleIdx].pxx.receiver_channel_9_16 << 1);