From e716e747b03d8609015159efff96365430798412 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 9 Jul 2019 23:08:37 +0200 Subject: [PATCH] R9M mode "8CH with telemetry" removed from ACCESS protocol --- radio/src/gui/480x272/model_setup.cpp | 6 +----- radio/src/gui/common/stdlcd/model_setup_pxx2.cpp | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index 2b3bbb5c7..ea3004ed4 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -144,10 +144,7 @@ const char * STR_BIND_FLEX_915 = "Flex 915MHz"; void onPXX2R9MBindModeMenu(const char * result) { - if (result == STR_BIND_8CH_WITH_TELEM) { - reusableBuffer.moduleSetup.bindInformation.lbtMode = 0; - } - else if (result == STR_BIND_16CH_WITH_TELEM) { + if (result == STR_BIND_16CH_WITH_TELEM) { reusableBuffer.moduleSetup.bindInformation.lbtMode = 1; } else if (result == STR_BIND_16CH_WITHOUT_TELEM) { @@ -246,7 +243,6 @@ void onPXX2BindMenu(const char * result) reusableBuffer.moduleSetup.bindInformation.selectedReceiverIndex = (result - reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[0]) / sizeof(reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[0]); if (isModuleR9MAccess(moduleIdx) && reusableBuffer.moduleSetup.pxx2.moduleInformation.information.variant == PXX2_VARIANT_EU) { reusableBuffer.moduleSetup.bindInformation.step = BIND_RX_NAME_SELECTED; - POPUP_MENU_ADD_ITEM(STR_8CH_WITH_TELEMETRY); POPUP_MENU_ADD_ITEM(STR_16CH_WITH_TELEMETRY); POPUP_MENU_ADD_ITEM(STR_16CH_WITHOUT_TELEMETRY); POPUP_MENU_START(onPXX2R9MBindModeMenu); diff --git a/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp b/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp index d865d1aec..5d97812dd 100644 --- a/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp +++ b/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp @@ -41,10 +41,7 @@ void removePXX2ReceiverIfEmpty(uint8_t moduleIdx, uint8_t receiverIdx) void onPXX2R9MBindModeMenu(const char * result) { - if (result == STR_8CH_WITH_TELEMETRY) { - reusableBuffer.moduleSetup.bindInformation.lbtMode = 0; - } - else if (result == STR_16CH_WITH_TELEMETRY) { + if (result == STR_16CH_WITH_TELEMETRY) { reusableBuffer.moduleSetup.bindInformation.lbtMode = 1; } else if (result == STR_16CH_WITHOUT_TELEMETRY) { @@ -85,7 +82,6 @@ void onPXX2BindMenu(const char * result) reusableBuffer.moduleSetup.bindInformation.selectedReceiverIndex = (result - reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[0]) / sizeof(reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[0]); if (isModuleR9MAccess(moduleIdx) && reusableBuffer.moduleSetup.pxx2.moduleInformation.information.variant == PXX2_VARIANT_EU) { reusableBuffer.moduleSetup.bindInformation.step = BIND_RX_NAME_SELECTED; - POPUP_MENU_ADD_ITEM(STR_8CH_WITH_TELEMETRY); POPUP_MENU_ADD_ITEM(STR_16CH_WITH_TELEMETRY); POPUP_MENU_ADD_ITEM(STR_16CH_WITHOUT_TELEMETRY); POPUP_MENU_START(onPXX2R9MBindModeMenu);