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

Apply THR trim when cross triming (#5664)

Browse Source
This commit is contained in:
3djc
2018-02-11 23:26:29 +01:00
committed by Andre Bernet
parent d3951235bd
commit 1ebd2894c2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/mixer.cpp
+2 -2
View File
@@ -644,7 +644,7 @@ int getStickTrimValue(int stick, int stickValue)
return 0; return 0;
int trim = trims[stick]; int trim = trims[stick];
if (stick == THR_STICK) { if (stick == virtualInputsTrims[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;
trim = ((g_model.throttleReversed ? (trim+trimMin) : (trim-trimMin)) * (RESX-stickValue)) >> (RESX_SHIFT+1); trim = ((g_model.throttleReversed ? (trim+trimMin) : (trim-trimMin)) * (RESX-stickValue)) >> (RESX_SHIFT+1);
@@ -1101,7 +1101,7 @@ uint8_t flightModeTransitionLast = 255;
void evalMixes(uint8_t tick10ms) void evalMixes(uint8_t tick10ms)
{ {
int32_t sum_chans512[MAX_OUTPUT_CHANNELS]; int32_t sum_chans512[MAX_OUTPUT_CHANNELS];
#if defined(PCBMEGA2560) && defined(DEBUG) && !defined(VOICE) #if defined(PCBMEGA2560) && defined(DEBUG) && !defined(VOICE)
PORTH |= 0x40; // PORTH:6 LOW->HIGH signals start of mixer interrupt PORTH |= 0x40; // PORTH:6 LOW->HIGH signals start of mixer interrupt
#endif #endif