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

Trims bug fixed

Browse source
This commit is contained in:
bsongis 2015-02-16 00:37:45 +01:00
parent 1e76e24dd7
commit d4b2bd2142
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
radio/src/mixer.cpp
View file

@ -551,14 +551,13 @@ void evalInputs(uint8_t mode)
} }
#if defined(VIRTUALINPUTS) #if defined(VIRTUALINPUTS)
int getStickTrimValue(int stick) int getStickTrimValue(int stick, int value)
{ {
int trim = trims[stick]; int trim = trims[stick];
if (stick == THR_STICK) { if (stick == THR_STICK) {
if (g_model.thrTrim) { if (g_model.thrTrim) {
int trimMin = g_model.extendedTrims ? 2*TRIM_EXTENDED_MIN : 2*TRIM_MIN; int trimMin = g_model.extendedTrims ? 2*TRIM_EXTENDED_MIN : 2*TRIM_MIN;
int v = calibratedStick[THR_STICK]; trim = ((g_model.throttleReversed ? (trim+trimMin) : (trim-trimMin)) * (RESX-value)) >> (RESX_SHIFT+1);
trim = (((g_model.throttleReversed)?(trim+trimMin):(trim-v)) * (RESX-v)) >> (RESX_SHIFT+1);
} }
if (g_model.throttleReversed) { if (g_model.throttleReversed) {
trim = -trim; trim = -trim;
@ -567,12 +566,12 @@ int getStickTrimValue(int stick)
return trim; return trim;
} }
int getSourceTrimValue(int source) int getSourceTrimValue(int source, int value=0)
{ {
if (source >= MIXSRC_Rud && source <= MIXSRC_Ail) if (source >= MIXSRC_Rud && source <= MIXSRC_Ail)
return getStickTrimValue(source - MIXSRC_Rud); return getStickTrimValue(source - MIXSRC_Rud, value);
else if (source >= MIXSRC_FIRST_INPUT && source <= MIXSRC_LAST_INPUT) else if (source >= MIXSRC_FIRST_INPUT && source <= MIXSRC_LAST_INPUT)
return getStickTrimValue(virtualInputsTrims[source - MIXSRC_FIRST_INPUT]); return getStickTrimValue(virtualInputsTrims[source - MIXSRC_FIRST_INPUT], value);
else else
return 0; return 0;
} }
@ -812,7 +811,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
if (!(mode & e_perout_mode_notrims)) { if (!(mode & e_perout_mode_notrims)) {
#if defined(VIRTUALINPUTS) #if defined(VIRTUALINPUTS)
if (md->carryTrim == 0) { if (md->carryTrim == 0) {
v += getSourceTrimValue(md->srcRaw); v += getSourceTrimValue(md->srcRaw, v);
} }
#else #else
int8_t mix_trim = md->carryTrim; int8_t mix_trim = md->carryTrim;

2
radio/src/opentx.cpp
View file

@ -1565,7 +1565,7 @@ FORCEINLINE void evalTrims()
for (uint8_t i=0; i<NUM_STICKS; i++) { for (uint8_t i=0; i<NUM_STICKS; i++) {
// do trim -> throttle trim if applicable // do trim -> throttle trim if applicable
int16_t trim = getTrimValue(phase, i); int16_t trim = getTrimValue(phase, i);
#if !defined(PCBTARANIS) #if !defined(VIRTUALINPUTS)
if (i==THR_STICK && g_model.thrTrim) { if (i==THR_STICK && g_model.thrTrim) {
int16_t trimMin = g_model.extendedTrims ? TRIM_EXTENDED_MIN : TRIM_MIN; int16_t trimMin = g_model.extendedTrims ? TRIM_EXTENDED_MIN : TRIM_MIN;
trim = (((g_model.throttleReversed)?(int32_t)(trim+trimMin):(int32_t)(trim-trimMin)) * (RESX-anas[i])) >> (RESX_SHIFT+1); trim = (((g_model.throttleReversed)?(int32_t)(trim+trimMin):(int32_t)(trim-trimMin)) * (RESX-anas[i])) >> (RESX_SHIFT+1);