fix: do not display trims on main view when trim set as 3POS/NONE (#4777)

This commit is contained in:
3djc
2024-03-22 20:52:24 +10:00
committed by GitHub
parent 91630a02f7
commit 49c1cb8b73
3 changed files with 14 additions and 2 deletions
+1 -1
View File
@@ -162,7 +162,7 @@ void displayTrims(uint8_t phase)
uint8_t att = ROUND;
int16_t val = getTrimValue(phase, i);
if (getRawTrimValue(phase, i).mode == TRIM_MODE_NONE)
if (getRawTrimValue(phase, i).mode == TRIM_MODE_NONE || getRawTrimValue(phase, i).mode == TRIM_MODE_3POS)
continue;
int16_t dir = val;
+1 -1
View File
@@ -124,7 +124,7 @@ void displayTrims(uint8_t phase)
int32_t val = trim;
bool exttrim = false;
if(getRawTrimValue(phase, i).mode == TRIM_MODE_NONE)
if(getRawTrimValue(phase, i).mode == TRIM_MODE_NONE || getRawTrimValue(phase, i).mode == TRIM_MODE_3POS)
continue;
if (val < TRIM_MIN || val > TRIM_MAX) {
+12
View File
@@ -48,6 +48,18 @@ void MainViewTrim::checkEvents()
{
Window::checkEvents();
int8_t stickIndex = inputMappingConvertMode(idx);
trim_t v = getRawTrimValue(mixerCurrentFlightMode, stickIndex);
if (v.mode == TRIM_MODE_NONE || v.mode == TRIM_MODE_3POS) {
// Hide trim if not being used
if (!lv_obj_has_flag(lvobj, LV_OBJ_FLAG_HIDDEN))
lv_obj_add_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
return;
} else {
if (lv_obj_has_flag(lvobj, LV_OBJ_FLAG_HIDDEN))
lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
}
int newValue = getTrimValue(mixerCurrentFlightMode, stickIndex);
setRange();