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

Fix default model index

Browse Source
This commit is contained in:
Raphael Coeffic
2021-11-10 11:07:03 +01:00
parent 2537c7a004
commit 5a727ed6d1
6 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/tests/gtests.h
+1 -1
View File
@@ -106,7 +106,7 @@ class OpenTxTest : public testing::Test
SYSTEM_RESET();
MODEL_RESET();
MIXER_RESET();
setModelDefaults(0);
setModelDefaults();
RADIO_RESET();
}
};
radio/src/tests/mixer.cpp
+8 -8
View File
@@ -467,7 +467,7 @@ TEST(Curves, LinearIntpol)
SYSTEM_RESET();
MODEL_RESET();
MIXER_RESET();
setModelDefaults(0);
setModelDefaults();
for (int8_t i=-2; i<=2; i++) {
g_model.points[2+i] = 50*i;
}
@@ -673,7 +673,7 @@ TEST_F(TrimsTest, throttleTrimEle) {
SYSTEM_RESET();
MODEL_RESET();
MIXER_RESET();
setModelDefaults(0);
setModelDefaults();
g_eeGeneral.templateSetup = 17;
applyDefaultTemplate();
g_model.thrTrim = 1;
@@ -686,7 +686,7 @@ TEST_F(TrimsTest, throttleTrimEle) {
SYSTEM_RESET();
MODEL_RESET();
MIXER_RESET();
setModelDefaults(0);
setModelDefaults();
g_eeGeneral.templateSetup = 0;
applyDefaultTemplate();
}
@@ -697,7 +697,7 @@ TEST(Heli, BasicTest)
SYSTEM_RESET();
MODEL_RESET();
MIXER_RESET();
setModelDefaults(0);
setModelDefaults();
g_model.swashR.collectiveSource = MIXSRC_Thr;
g_model.swashR.elevatorSource = MIXSRC_Ele;
g_model.swashR.aileronSource = MIXSRC_Ail;
@@ -729,7 +729,7 @@ TEST(Heli, Mode2Test)
SYSTEM_RESET();
MODEL_RESET();
MIXER_RESET();
setModelDefaults(0);
setModelDefaults();
g_eeGeneral.templateSetup = 2;
applyDefaultTemplate();
g_model.swashR.collectiveSource = MIXSRC_Thr;
@@ -765,7 +765,7 @@ TEST(Trainer, UnpluggedTest)
SYSTEM_RESET();
MODEL_RESET();
MIXER_RESET();
setModelDefaults(0);
setModelDefaults();
g_model.mixData[0].destCh = 0;
g_model.mixData[0].mltpx = MLTPX_ADD;
g_model.mixData[0].srcRaw = MIXSRC_FIRST_TRAINER;
@@ -782,7 +782,7 @@ TEST_F(MixerTest, flightModeTransition)
SYSTEM_RESET();
MODEL_RESET();
MIXER_RESET();
setModelDefaults(0);
setModelDefaults();
g_model.flightModeData[1].swtch = TR(SWSRC_ID2, SWSRC_SA2);
g_model.flightModeData[0].fadeIn = 100;
g_model.flightModeData[0].fadeOut = 100;
@@ -808,7 +808,7 @@ TEST_F(MixerTest, flightModeOverflow)
SYSTEM_RESET();
MODEL_RESET();
MIXER_RESET();
setModelDefaults(0);
setModelDefaults();
g_model.flightModeData[1].swtch = TR(SWSRC_ID2, SWSRC_SA2);
g_model.flightModeData[0].fadeIn = 100;
g_model.flightModeData[0].fadeOut = 100;
radio/src/tests/switches.cpp
+2 -2
View File
@@ -78,7 +78,7 @@ TEST(getSwitch, nullSW)
TEST(getSwitch, inputWithTrim)
{
MODEL_RESET();
setModelDefaults(0);
setModelDefaults();
MIXER_RESET();
// g_model.logicalSw[0] = { LS_FUNC_VPOS, MIXSRC_FIRST_INPUT, 0, 0 };
@@ -100,7 +100,7 @@ TEST(evalLogicalSwitches, playFile)
{
SYSTEM_RESET();
MODEL_RESET();
setModelDefaults(0);
setModelDefaults();
MIXER_RESET();
extern BitField<(MAX_LOGICAL_SWITCHES * 2/*on, off*/)> sdAvailableLogicalSwitchAudioFiles;