piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(fw): Behaviour of 3POS trim when used as SF Adjust GV source (#4517)

Browse Source
This commit is contained in:
philmoz
2024-01-10 10:45:34 +10:00
committed by GitHub
parent 86a3d2db1c
commit 6479081e09
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+5 -4
View File
@@ -901,6 +901,7 @@ void checkTrims()
uint8_t phase; uint8_t phase;
int before; int before;
bool thro; bool thro;
trim_t tmode = getRawTrimValue(mixerCurrentFlightMode, idx);
trimsDisplayTimer = 200; // 2 seconds trimsDisplayTimer = 200; // 2 seconds
trimsDisplayMask |= (1<<idx); trimsDisplayMask |= (1<<idx);
@@ -922,17 +923,17 @@ void checkTrims()
thro = (idx==inputMappingConvertMode(inputMappingGetThrottle()) && g_model.thrTrim); thro = (idx==inputMappingConvertMode(inputMappingGetThrottle()) && g_model.thrTrim);
#endif #endif
int8_t trimInc = g_model.trimInc + 1; int8_t trimInc = g_model.trimInc + 1;
int8_t v = (trimInc==-1) ? min(32, abs(before)/4+1) : (1 << trimInc); // TODO flash saving if (trimInc < 0) int16_t v = (trimInc==-1) ? min(32, abs(before)/4+1) : (1 << trimInc); // TODO flash saving if (trimInc < 0)
if (thro) v = 4; // if throttle trim and trim throttle then step=4 if (thro) v = 4; // if throttle trim and trim throttle then step=4
#if defined(GVARS) #if defined(GVARS)
if (TRIM_REUSED(idx)) v = 1; if (TRIM_REUSED(idx)) v = tmode.mode == TRIM_MODE_3POS ? RESX : 1;
#endif #endif
int16_t after = (k&1) ? before + v : before - v; // positive = k&1 int16_t after = (k&1) ? before + v : before - v; // positive = k&1
bool beepTrim = true; bool beepTrim = true;
if (!thro && before!=0 && ((!(after < 0) == (before < 0)) || after==0)) { //forcing a stop at centered trim when changing sides if (!thro && before!=0 && tmode.mode != TRIM_MODE_3POS &&
((!(after < 0) == (before < 0)) || after==0)) { //forcing a stop at centered trim when changing sides
after = 0; after = 0;
beepTrim = true;
AUDIO_TRIM_MIDDLE(); AUDIO_TRIM_MIDDLE();
pauseTrimEvents(event); pauseTrimEvents(event);
} }