fix: do not display trims on main view when trim set as 3POS/NONE (#4777)
This commit is contained in:
@@ -162,7 +162,7 @@ void displayTrims(uint8_t phase)
|
|||||||
uint8_t att = ROUND;
|
uint8_t att = ROUND;
|
||||||
int16_t val = getTrimValue(phase, i);
|
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;
|
continue;
|
||||||
|
|
||||||
int16_t dir = val;
|
int16_t dir = val;
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ void displayTrims(uint8_t phase)
|
|||||||
int32_t val = trim;
|
int32_t val = trim;
|
||||||
bool exttrim = false;
|
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;
|
continue;
|
||||||
|
|
||||||
if (val < TRIM_MIN || val > TRIM_MAX) {
|
if (val < TRIM_MIN || val > TRIM_MAX) {
|
||||||
|
|||||||
@@ -48,6 +48,18 @@ void MainViewTrim::checkEvents()
|
|||||||
{
|
{
|
||||||
Window::checkEvents();
|
Window::checkEvents();
|
||||||
int8_t stickIndex = inputMappingConvertMode(idx);
|
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);
|
int newValue = getTrimValue(mixerCurrentFlightMode, stickIndex);
|
||||||
|
|
||||||
setRange();
|
setRange();
|
||||||
|
|||||||
Reference in New Issue
Block a user