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

Apply #6036 equivalent to 2.3

Browse Source
This commit is contained in:
3djc
2018-07-12 12:22:07 +02:00
parent 12d675a0a7
commit 3556d7c0e8
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+2 -2
View File
@@ -1141,12 +1141,12 @@ void checkTrims()
else {
phase = getTrimFlightMode(mixerCurrentFlightMode, idx);
before = getTrimValue(phase, idx);
thro = (IS_THROTTLE_TRIM(idx) && g_model.thrTrim);
thro = (idx==THR_STICK && g_model.thrTrim);
}
#else
phase = getTrimFlightMode(mixerCurrentFlightMode, idx);
before = getTrimValue(phase, idx);
thro = (IS_THROTTLE_TRIM(idx) && g_model.thrTrim);
thro = (idx==THR_STICK && g_model.thrTrim);
#endif
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)