diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index e53d33c9a..3bd28fffc 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -252,7 +252,7 @@ inline uint8_t EXTERNAL_MODULE_TYPE_ROW() return 1; #if defined(MULTIMODULE) else if (isModuleMultimodule(EXTERNAL_MODULE)) { - return 2 + MULTIMODULE_RFPROTO_COLUMNS(EXTERNAL_MODULE); + return 1 + MULTIMODULE_RFPROTO_COLUMNS(EXTERNAL_MODULE); } #endif else diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index 546728126..0cd17f13a 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -480,7 +480,7 @@ inline uint8_t EXTERNAL_MODULE_TYPE_ROW() return 1; #if defined(MULTIMODULE) else if (isModuleMultimodule(EXTERNAL_MODULE)) { - return 2 + MULTIMODULE_RFPROTO_COLUMNS(EXTERNAL_MODULE); + return 1 + MULTIMODULE_RFPROTO_COLUMNS(EXTERNAL_MODULE); } #endif else @@ -528,20 +528,20 @@ bool menuModelSetup(event_t event) int8_t old_editMode = s_editMode; MENU(STR_MENUSETUP, MODEL_ICONS, menuTabModel, MENU_MODEL_SETUP, ITEM_MODEL_SETUP_MAX, - { 0, // Model name - 0, // Model bitmap + { 0, // Model name + 0, // Model bitmap TIMERS_ROWS, 0, // Extended limits 1, // Extended trims 0, // Show trims 0, // Trims step - - LABEL(Throttle), + + LABEL(Throttle), 0, // Throttle reverse 0, // Throttle trace source 0, // Throttle trim - - LABEL(PreflightCheck), + + LABEL(PreflightCheck), 0, // Display checklist 0, // Throttle state uint8_t(NAVIGATION_LINE_BY_LINE|(getSwitchWarningsCount()-1)), // Switches warnings @@ -1099,7 +1099,7 @@ bool menuModelSetup(event_t event) #endif } } -#endif +#endif } break; diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h index 50b282a59..4a2663c12 100644 --- a/radio/src/gui/gui_common.h +++ b/radio/src/gui/gui_common.h @@ -141,7 +141,11 @@ inline bool MULTIMODULE_HAS_SUBTYPE(uint8_t moduleIdx) } inline uint8_t MULTIMODULE_RFPROTO_COLUMNS(uint8_t moduleIdx) { +#if LCD_W < 212 return (g_model.moduleData[moduleIdx].multi.customProto ? (uint8_t) 1 : MULTIMODULE_HAS_SUBTYPE(g_model.moduleData[moduleIdx].getMultiProtocol(true)) ? (uint8_t) 0 : HIDDEN_ROW); +#else + return (g_model.moduleData[moduleIdx].multi.customProto ? (uint8_t) 1 : MULTIMODULE_HAS_SUBTYPE(g_model.moduleData[moduleIdx].getMultiProtocol(true)) ? (uint8_t) 1 : 0); +#endif } #define MULTIMODULE_SUBTYPE_ROWS(x) isModuleMultimodule(x) ? MULTIMODULE_RFPROTO_COLUMNS(x) : HIDDEN_ROW, #define MULTIMODULE_HASOPTIONS(x) (getMultiProtocolDefinition(x)->optionsstr != nullptr)