Fixes #6032
This commit is contained in:
@@ -1386,7 +1386,7 @@ uint8_t checkTrim(event_t event)
|
|||||||
#else
|
#else
|
||||||
before = getRawTrimValue(phase, idx);
|
before = getRawTrimValue(phase, idx);
|
||||||
#endif
|
#endif
|
||||||
thro = (IS_THROTTLE_TRIM(idx) && g_model.thrTrim);
|
thro = (idx==THR_STICK && g_model.thrTrim);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
phase = getTrimFlightMode(mixerCurrentFlightMode, idx);
|
phase = getTrimFlightMode(mixerCurrentFlightMode, idx);
|
||||||
@@ -1395,7 +1395,7 @@ uint8_t checkTrim(event_t event)
|
|||||||
#else
|
#else
|
||||||
before = getRawTrimValue(phase, idx);
|
before = getRawTrimValue(phase, idx);
|
||||||
#endif
|
#endif
|
||||||
thro = (IS_THROTTLE_TRIM(idx) && g_model.thrTrim);
|
thro = (idx==THR_STICK && 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)
|
int8_t v = (trimInc==-1) ? min(32, abs(before)/4+1) : (1 << trimInc); // TODO flash saving if (trimInc < 0)
|
||||||
|
|||||||
@@ -334,12 +334,6 @@ void memswap(void * a, void * b, uint8_t size);
|
|||||||
#define IS_MULTIPOS_CALIBRATED(cal) (false)
|
#define IS_MULTIPOS_CALIBRATED(cal) (false)
|
||||||
#endif
|
#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)
|
#if defined(PWR_BUTTON_PRESS)
|
||||||
#define pwrOffPressed() pwrPressed()
|
#define pwrOffPressed() pwrPressed()
|
||||||
#else
|
#else
|
||||||
|
|||||||
Reference in New Issue
Block a user