From b35baecfb9e6b290b4c038421af872a37f0ffd57 Mon Sep 17 00:00:00 2001 From: philmoz Date: Sun, 24 Nov 2024 14:22:57 +1100 Subject: [PATCH] fix(radio): trim values scaled incorrectly when displayed via Lua (#5674) --- radio/src/mixer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index dd444c9af..ab0a110c4 100644 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -417,8 +417,7 @@ getvalue_t _getValue(mixsrc_t i, bool* valid) else if (trimDown(tidx + 1)) return RESX; return 0; } - auto trim_value = getTrimValue(mixerCurrentFlightMode, i); - return calc1000toRESX((int16_t)8 * trim_value); + return 8 * getTrimValue(mixerCurrentFlightMode, i); } else if (i >= MIXSRC_FIRST_SWITCH && i <= MIXSRC_LAST_SWITCH) { auto sw_idx = (uint8_t)(i - MIXSRC_FIRST_SWITCH); @@ -428,7 +427,7 @@ getvalue_t _getValue(mixsrc_t i, bool* valid) auto fct_idx = sw_idx - max_reg_switches; auto max_fct_switches = switchGetMaxFctSwitches(); if (fct_idx < max_fct_switches) { - return _switch_2pos_lookup[getFSLogicalState(fct_idx)]; + return _switch_2pos_lookup[getFSLogicalState(fct_idx)]; } } #endif