From 00efc0d571e899a7844d6ecc06ca3f56f1687852 Mon Sep 17 00:00:00 2001
From: Max Paperno <max@wdg.us>
Date: Thu, 12 Jul 2018 13:15:41 -0400
Subject: [PATCH] Merge fix.

---
 radio/src/tests/mixer.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/radio/src/tests/mixer.cpp b/radio/src/tests/mixer.cpp
index 8156a49af..8ed170aaf 100644
--- a/radio/src/tests/mixer.cpp
+++ b/radio/src/tests/mixer.cpp
@@ -568,22 +568,6 @@ TEST_F(MixerTest, SlowOnMultiply)
   CHECK_NO_MOVEMENT(0, CHANNEL_MAX, 250);
 }
 
-TEST_F(TrimsTest, throttleTrimEle) {
-  SYSTEM_RESET();
-  MODEL_RESET();
-  MIXER_RESET();
-  modelDefault(0);
-  g_eeGeneral.templateSetup = 17;
-  applyDefaultTemplate();
-  g_model.thrTrim = 1;
-// checks ELE sticks are not affected by throttleTrim
-// stick max + trim min
-  anaInValues[ELE_STICK] = +1024;
-  setTrimValue(0, ELE_STICK, TRIM_MIN);
-  evalMixes(1);
-  EXPECT_EQ(channelOutputs[2], 1024 - 250);
-}
-
 #if defined(HELI)
 TEST(Heli, BasicTest)
 {