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

Fixes #6032

Browse Source
This commit is contained in:
Bertrand Songis
2018-07-11 22:51:10 +02:00
parent 39db1b6537
commit e10cbed69f
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+2 -2
View File
@@ -1386,7 +1386,7 @@ uint8_t checkTrim(event_t event)
#else
before = getRawTrimValue(phase, idx);
#endif
thro = (IS_THROTTLE_TRIM(idx) && g_model.thrTrim);
thro = (idx==THR_STICK && g_model.thrTrim);
}
#else
phase = getTrimFlightMode(mixerCurrentFlightMode, idx);
@@ -1395,7 +1395,7 @@ uint8_t checkTrim(event_t event)
#else
before = getRawTrimValue(phase, idx);
#endif
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)
radio/src/opentx.h
-6
View File
@@ -334,12 +334,6 @@ void memswap(void * a, void * b, uint8_t size);
#define IS_MULTIPOS_CALIBRATED(cal) (false)
#endif
#if defined(VIRTUAL_INPUTS)
#define IS_THROTTLE_TRIM(x) (x == virtualInputsTrims[THR_STICK])
#else
#define IS_THROTTLE_TRIM(x) (x == THR_STICK)
#endif
#if defined(PWR_BUTTON_PRESS)
#define pwrOffPressed() pwrPressed()
#else