From 5decefd4a293964f184bfd488714837cf7fd3d09 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 11 Feb 2024 00:19:34 +0100 Subject: [PATCH] fix: MT12 "ghost" trim entries (#4620) --- radio/src/gui/128x64/model_flightmodes.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/radio/src/gui/128x64/model_flightmodes.cpp b/radio/src/gui/128x64/model_flightmodes.cpp index 4fb1f0168..b3ec4371c 100644 --- a/radio/src/gui/128x64/model_flightmodes.cpp +++ b/radio/src/gui/128x64/model_flightmodes.cpp @@ -73,15 +73,17 @@ void menuModelFlightModeOne(event_t event) #if defined(GVARS) && !defined(GVARS_IN_CURVES_SCREEN) + int VERTICAL_SHIFT = (ITEM_MODEL_FLIGHT_MODE_FADE_IN-ITEM_MODEL_FLIGHT_MODE_TRIMS) - (keysGetMaxTrims() > 4 ? 1 : 0 ); + static const uint8_t mstate_tab_fm1[] = {0, 3, #if defined(TRIMS_GPIO_REG_T5L) || defined(TRIMS_GPIO_REG_LSD) - #define VERTICAL_SHIFT (ITEM_MODEL_FLIGHT_MODE_FADE_IN-ITEM_MODEL_FLIGHT_MODE_TRIMS2) - static const uint8_t mstate_tab_fm1[] = {0, 3, 3, 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1, 1}; - static const uint8_t mstate_tab_others[] = {0, 0, 3, 3, 0, 0,(uint8_t)-1, 2, 2, 2, 2, 2}; -#else - #define VERTICAL_SHIFT (ITEM_MODEL_FLIGHT_MODE_FADE_IN-ITEM_MODEL_FLIGHT_MODE_TRIMS) - static const uint8_t mstate_tab_fm1[] = {0, 3, 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1, 1}; - static const uint8_t mstate_tab_others[] = {0, 0, 3, 0, 0, (uint8_t)-1, 2, 2, 2, 2, 2}; + (uint8_t)max(0, keysGetMaxTrims() - 5), #endif + 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1, 1}; + static const uint8_t mstate_tab_others[] = {0, 0, 3, +#if defined(TRIMS_GPIO_REG_T5L) || defined(TRIMS_GPIO_REG_LSD) + (uint8_t)max(0, keysGetMaxTrims() - 5), +#endif + 0, 0,(uint8_t)-1, 2, 2, 2, 2, 2}; check(event, 0, nullptr, 0, (s_currIdx == 0) ? mstate_tab_fm1 : mstate_tab_others, DIM(mstate_tab_others)-1, ITEM_MODEL_FLIGHT_MODE_MAX - HEADER_LINE - (s_currIdx==0 ? (ITEM_MODEL_FLIGHT_MODE_FADE_IN-ITEM_MODEL_FLIGHT_MODE_SWITCH-1) : 0));