From 89656d81952d25e637d6e7f8a7d9bfeb801e441a Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 12 Jul 2018 08:56:03 +0200 Subject: [PATCH] Fix Gtest (fullfilling my debt !) --- radio/src/tests/mixer.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/radio/src/tests/mixer.cpp b/radio/src/tests/mixer.cpp index be98ee981..367f6db13 100644 --- a/radio/src/tests/mixer.cpp +++ b/radio/src/tests/mixer.cpp @@ -75,13 +75,6 @@ TEST_F(TrimsTest, throttleTrim) setTrimValue(0, THR_STICK, TRIM_MIN); evalMixes(1); EXPECT_EQ(channelOutputs[2], -1024); - // 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[1], 1024-250); - // now the same tests with extended Trims g_model.extendedTrims = 1; // stick max + trim max @@ -398,6 +391,22 @@ TEST_F(TrimsTest, InstantTrimNegativeCurve) } #endif +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); +} + TEST(Curves, LinearIntpol) { SYSTEM_RESET();