Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 01:05:10 +03:00
Code Issues Wiki Activity

Fix for the case of extended trims

Browse source 
Code cleanup
This commit is contained in:
Damjan Adamic 2014-07-31 15:47:32 +02:00
parent 21ae270c0e
commit 828372ab29
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/mixer.cpp
View file

@ -752,12 +752,8 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
int32_t trim = trims[mix_trim];
if (mix_trim == THR_STICK) {
if (g_model.thrTrim) {
if (g_model.throttleReversed) {
trim = ((int32_t)(trim+TRIM_MIN) * (RESX-v)) >> (RESX_SHIFT+1);
}
else {
trim = ((int32_t)(trim-TRIM_MIN) * (RESX-v)) >> (RESX_SHIFT+1);
}
int16_t trimMin = g_model.extendedTrims ? 2*TRIM_EXTENDED_MIN : 2*TRIM_MIN;
trim = (((g_model.throttleReversed)?(trim+trimMin):(trim-trimMin)) * (RESX-v)) >> (RESX_SHIFT+1);
}
if (g_model.throttleReversed) {
trim = -trim;

3
radio/src/opentx.cpp
View file

@ -1661,7 +1661,8 @@ FORCEINLINE void evalTrims()
int16_t trim = getTrimValue(phase, i);
#if !defined(PCBTARANIS)
if (i==THR_STICK && g_model.thrTrim) {
trim = (((g_model.throttleReversed)?(int32_t)(trim+TRIM_MIN):(int32_t)(trim-TRIM_MIN)) * (RESX-getValue(MIXSRC_Thr))) >> (RESX_SHIFT+1);
int16_t trimMin = g_model.extendedTrims ? TRIM_EXTENDED_MIN : TRIM_MIN;
trim = (((g_model.throttleReversed)?(int32_t)(trim+trimMin):(int32_t)(trim-trimMin)) * (RESX-getValue(MIXSRC_Thr))) >> (RESX_SHIFT+1);
}
#endif
if (trimsCheckTimer > 0) {