From 1ebd2894c22751709da4268fc4cc22e75bdd5b5d Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Sun, 11 Feb 2018 23:26:29 +0100
Subject: [PATCH] Apply THR trim when cross triming (#5664)

---
 radio/src/mixer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index 99ab1e71f..9eb1d6726 100644
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -644,7 +644,7 @@ int getStickTrimValue(int stick, int stickValue)
     return 0;
 
   int trim = trims[stick];
-  if (stick == THR_STICK) {
+  if (stick == virtualInputsTrims[THR_STICK]) {
     if (g_model.thrTrim) {
       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);
@@ -1101,7 +1101,7 @@ uint8_t   flightModeTransitionLast = 255;
 
 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)
   PORTH |= 0x40; // PORTH:6 LOW->HIGH signals start of mixer interrupt
 #endif