From 8b419770e29353386a65431823f7076e2ce45141 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sat, 31 Oct 2015 11:24:28 +0400 Subject: [PATCH] Harmonise module default channel count --- radio/src/gui/Taranis/menu_model_setup.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/radio/src/gui/Taranis/menu_model_setup.cpp b/radio/src/gui/Taranis/menu_model_setup.cpp index a41451e96..e26e61dfa 100644 --- a/radio/src/gui/Taranis/menu_model_setup.cpp +++ b/radio/src/gui/Taranis/menu_model_setup.cpp @@ -645,17 +645,14 @@ void menuModelSetup(uint8_t event) if (checkIncDec_Ret) { g_model.moduleData[INTERNAL_MODULE].rfProtocol = 0; g_model.moduleData[INTERNAL_MODULE].channelsStart = 0; - if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_PPM) - g_model.moduleData[INTERNAL_MODULE].channelsCount = 0; - else - g_model.moduleData[INTERNAL_MODULE].channelsCount = MAX_INTERNAL_MODULE_CHANNELS(); + g_model.moduleData[INTERNAL_MODULE].channelsCount = 0; } break; case 1: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, RF_PROTO_X16, RF_PROTO_LAST); if (checkIncDec_Ret) { g_model.moduleData[INTERNAL_MODULE].channelsStart = 0; - g_model.moduleData[INTERNAL_MODULE].channelsCount = MAX_INTERNAL_MODULE_CHANNELS(); + g_model.moduleData[INTERNAL_MODULE].channelsCount = 0; } } } @@ -696,10 +693,8 @@ void menuModelSetup(uint8_t event) if (checkIncDec_Ret) { g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0; g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0; - if (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) - g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0; - else - g_model.moduleData[EXTERNAL_MODULE].channelsCount = MAX_EXTERNAL_MODULE_CHANNELS(); + g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0; + } break; case 1: @@ -709,7 +704,7 @@ void menuModelSetup(uint8_t event) CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].rfProtocol, RF_PROTO_X16, RF_PROTO_LAST); if (checkIncDec_Ret) { g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0; - g_model.moduleData[EXTERNAL_MODULE].channelsCount = MAX_EXTERNAL_MODULE_CHANNELS(); + g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0; } } }