Merge branch '2.2' into 2.3

2018-07-12 13:09:34 -04:00
parent 3556d7c0e8 b5078c5326
commit 7bc59784b5
2 changed files with 17 additions and 2 deletions
@@ -194,7 +194,7 @@ void LogicalSwitchesPanel::functionChanged()
      model->logicalSw[i].val2 = -129;
    }
  }
-  updateLine(i);
+  update();
  emit modified();
 }

@@ -75,7 +75,6 @@ TEST_F(TrimsTest, throttleTrim)
  setTrimValue(0, THR_STICK, TRIM_MIN);
  evalMixes(1);
  EXPECT_EQ(channelOutputs[2], -1024);
-
  // now the same tests with extended Trims
  g_model.extendedTrims = 1;
  // stick max + trim max
@@ -345,6 +344,22 @@ TEST_F(TrimsTest, InstantTrimNegativeCurve)
  EXPECT_EQ(128, getTrimValue(0, AIL_STICK));
 }

+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();