From a2c7e788c5bbd177d22a1730feee471078b74a6b Mon Sep 17 00:00:00 2001 From: Cedric Marzer Date: Mon, 18 May 2015 21:39:59 +0200 Subject: [PATCH] More changes, most of them cosmetic --- radio/src/gui/Taranis/menu_model_setup.cpp | 59 ++++++++++------------ 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/radio/src/gui/Taranis/menu_model_setup.cpp b/radio/src/gui/Taranis/menu_model_setup.cpp index 5942e8e07..a0c54676f 100644 --- a/radio/src/gui/Taranis/menu_model_setup.cpp +++ b/radio/src/gui/Taranis/menu_model_setup.cpp @@ -591,39 +591,36 @@ void menuModelSetup(uint8_t event) case ITEM_MODEL_INTERNAL_MODULE_LABEL: lcd_putsLeft(y, TR_INTERNALRF); - break; + break; #if defined(TARANIS_INTERNAL_PPM) - case ITEM_MODEL_INTERNAL_MODULE_MODE: - lcd_putsLeft(y, STR_MODE); - lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_TARANIS_PROTOCOLS, g_model.internalModule, m_posHorz==0 ? attr : 0); - if (IS_MODULE_XJT(INTERNAL_MODULE)) - lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_XJT_PROTOCOLS, 1+g_model.moduleData[INTERNAL_MODULE].rfProtocol, m_posHorz==1 ? attr : 0); - if (attr && s_editMode>0) { - switch (m_posHorz) { - case 0: - g_model.internalModule = checkIncDec(event, g_model.internalModule, MODULE_TYPE_NONE, MODULE_TYPE_COUNT-2, EE_MODEL, isModuleAvailable); - if (checkIncDec_Ret) { - g_model.moduleData[INTERNAL_MODULE].rfProtocol = 0; - g_model.moduleData[INTERNAL_MODULE].channelsStart = 0; - if (g_model.internalModule == MODULE_TYPE_PPM) - g_model.moduleData[INTERNAL_MODULE].channelsCount = 0; - else - g_model.moduleData[INTERNAL_MODULE].channelsCount = MAX_INTERNAL_MODULE_CHANNELS(); - } - 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(); - } - } - } - break; + case ITEM_MODEL_INTERNAL_MODULE_MODE: + lcd_putsLeft(y, STR_MODE); + lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_TARANIS_PROTOCOLS, g_model.internalModule, m_posHorz==0 ? attr : 0); + if (IS_MODULE_XJT(INTERNAL_MODULE)) + lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_XJT_PROTOCOLS, 1+g_model.moduleData[INTERNAL_MODULE].rfProtocol, m_posHorz==1 ? attr : 0); + if (attr && s_editMode>0) { + switch (m_posHorz) { + case 0: + g_model.internalModule = checkIncDec(event, g_model.internalModule, MODULE_TYPE_NONE, MODULE_TYPE_COUNT-2, EE_MODEL, isModuleAvailable); + if (checkIncDec_Ret) { + g_model.moduleData[INTERNAL_MODULE].rfProtocol = 0; + g_model.moduleData[INTERNAL_MODULE].channelsStart = 0; + if (g_model.internalModule == MODULE_TYPE_PPM) + g_model.moduleData[INTERNAL_MODULE].channelsCount = 0; + else + g_model.moduleData[INTERNAL_MODULE].channelsCount = MAX_INTERNAL_MODULE_CHANNELS(); + } + 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(); + } + } + } + break; #else - - case ITEM_MODEL_INTERNAL_MODULE_MODE: lcd_putsLeft(y, STR_MODE); lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_XJT_PROTOCOLS, 1+g_model.moduleData[0].rfProtocol, attr);