From 97983a6fc38a7bacdc1b3dbfed2e807a2747abc7 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 21 Feb 2019 11:21:07 +0100 Subject: [PATCH] XJT2 / R9M2 allowed even if internal module is present --- radio/src/gui/128x64/model_setup.cpp | 4 ++-- radio/src/gui/gui_common_arm.cpp | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 62c39c18d..6b322b24e 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -408,8 +408,8 @@ void menuModelSetup(event_t event) MULTIMODULE_SUBTYPE_ROWS(EXTERNAL_MODULE) MULTIMODULE_STATUS_ROWS EXTERNAL_MODULE_CHANNELS_ROWS, - IF_NOT_EXTERNAL_PXX2(EXTERNAL_MODULE_BIND_ROWS()), // line reused for PPM: PPM settings - IF_EXTERNAL_PXX2(0), // RxNum + IF_NOT_EXTERNAL_PXX2(EXTERNAL_MODULE_BIND_ROWS()), // line reused for PPM: PPM settings + IF_EXTERNAL_PXX2(0), // RxNum OUTPUT_TYPE_ROWS() IF_NOT_EXTERNAL_PXX2(EXTERNAL_MODULE_OPTION_ROW), MULTIMODULE_MODULE_ROWS diff --git a/radio/src/gui/gui_common_arm.cpp b/radio/src/gui/gui_common_arm.cpp index 77147d585..c72827ca6 100644 --- a/radio/src/gui/gui_common_arm.cpp +++ b/radio/src/gui/gui_common_arm.cpp @@ -561,15 +561,9 @@ bool isExternalModuleAvailable(int module) if (module == MODULE_TYPE_R9M && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) { return false; } - if (module == MODULE_TYPE_R9M2 && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) { - return false; - } if (module == MODULE_TYPE_XJT && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) { return false; } - if (module == MODULE_TYPE_XJT2 && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) { - return false; - } #endif return true;