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

Fixes #1059

Browse source
This commit is contained in:
bsongis 2014-05-05 14:40:48 +02:00
parent 934961e999
commit c53fbd9e94
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
radio/src/opentx.cpp
View file

@ -3918,7 +3918,7 @@ void perOut(uint8_t mode, uint8_t tick10ms)
//========== TRIMS ================ //========== TRIMS ================
if (!(mode & e_perout_mode_notrims)) { if (!(mode & e_perout_mode_notrims)) {
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
if (!md->carryTrim) { if (md->carryTrim == 0) {
int8_t mix_trim; int8_t mix_trim;
if (stickIndex < NUM_STICKS) if (stickIndex < NUM_STICKS)
mix_trim = stickIndex; mix_trim = stickIndex;
@ -3926,7 +3926,13 @@ void perOut(uint8_t mode, uint8_t tick10ms)
mix_trim = virtualInputsTrims[md->srcRaw-1]; mix_trim = virtualInputsTrims[md->srcRaw-1];
else else
mix_trim = -1; mix_trim = -1;
if (mix_trim >= 0) v += trims[mix_trim]; if (mix_trim >= 0) {
int16_t trim = trims[mix_trim];
if (mix_trim == THR_STICK && g_model.throttleReversed)
v -= trim;
else
v += trim;
}
} }
#else #else
int8_t mix_trim = md->carryTrim; int8_t mix_trim = md->carryTrim;
@ -3936,7 +3942,13 @@ void perOut(uint8_t mode, uint8_t tick10ms)
mix_trim = stickIndex; mix_trim = stickIndex;
else else
mix_trim = -1; mix_trim = -1;
if (mix_trim >= 0) v += trims[mix_trim]; if (mix_trim >= 0) {
int16_t trim = trims[mix_trim];
if (mix_trim == THR_STICK && g_model.throttleReversed)
v -= trim;
else
v += trim;
}
#endif #endif
} }
} }