From 977262232ac2ae759247383e7eee9a53366fef72 Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 12 Dec 2017 20:32:53 +0100 Subject: [PATCH] Better handle interactions with internal module telemetry (#5506) --- radio/src/gui/128x64/model_setup.cpp | 10 ++++++++-- radio/src/gui/212x64/model_setup.cpp | 10 ++++++++-- radio/src/gui/480x272/model_setup.cpp | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index b3cdb6265..72be35e2c 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1030,9 +1030,15 @@ void menuModelSetup(event_t event) default_selection = 2; } else { - POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON); + if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) + POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); + else + POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_OFF); - POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON); + if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) + POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); + else + 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 1b6703744..04345f957 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -1035,9 +1035,15 @@ void menuModelSetup(event_t event) default_selection = 1; } else { - POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON); + if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) + POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); + else + POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_OFF); - POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON); + if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) + POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); + else + 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 1672251c2..2d4a4de22 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -937,9 +937,15 @@ bool menuModelSetup(event_t event) default_selection = 2; } else { - POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON); + if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) + POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); + else + POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_ON); POPUP_MENU_ADD_ITEM(STR_BINDING_1_8_TELEM_OFF); - POPUP_MENU_ADD_ITEM(STR_BINDING_9_16_TELEM_ON); + if (IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) + POPUP_MENU_ADD_ITEM(STR_DISABLE_INTERNAL); + else + 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); }