From a6ab29d58dccde4c56ab0bef14f80c7a86bfcae1 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 30 Oct 2021 07:05:20 +0200 Subject: [PATCH] Added logical switch tests --- radio/src/tests/conversions.cpp | 17 ++++++++++++++--- radio/src/tests/model_25_tx16s.otx | Bin 846 -> 1649 bytes 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/radio/src/tests/conversions.cpp b/radio/src/tests/conversions.cpp index bfd51f3b9..831859572 100644 --- a/radio/src/tests/conversions.cpp +++ b/radio/src/tests/conversions.cpp @@ -445,9 +445,20 @@ TEST(Conversions, ConversionTX16SFrom25) EXPECT_EQ(ZOV_Color, color_option.type); EXPECT_EQ(0xFFFF, color_option.value.unsignedValue); - char modelname2[] = "model2.bin"; - convertBinModelData(modelname2, 220); - loadModel(modelname2); + char modelname3[] = "model3.bin"; + convertBinModelData(modelname3, 220); + loadModel(modelname3); + + EXPECT_EQ(LS_FUNC_EDGE, g_model.logicalSw[0].func); + EXPECT_EQ(SWSRC_SF2, g_model.logicalSw[0].v1); + EXPECT_EQ(-129, g_model.logicalSw[0].v2); + EXPECT_EQ(-1, g_model.logicalSw[0].v3); + EXPECT_EQ(SWSRC_SF2, g_model.logicalSw[0].andsw); + + EXPECT_EQ(LS_FUNC_VNEG, g_model.logicalSw[1].func); + EXPECT_EQ(MIXSRC_FIRST_INPUT, g_model.logicalSw[1].v1); + EXPECT_EQ(-98, g_model.logicalSw[1].v2); + EXPECT_EQ(SWSRC_NONE, g_model.logicalSw[1].andsw); simuFatfsSetPaths("",""); } diff --git a/radio/src/tests/model_25_tx16s.otx b/radio/src/tests/model_25_tx16s.otx index 88468cee716ab1acb8b48d3c3345a84bda41b32f..4307087b125e22c626fe97b6f6a65e6996cb8a5c 100644 GIT binary patch delta 1071 zcmX@d_L0Xbz?+#xgn@y9gTdD#E_ib+x2-skClAB|3^EKsjxL`5`nmZjsX4`ZB^4#1 zA)E}%4=>gvKE7Bp(MnNLV42|zP6mV-Hs*1`r}aZrA}1EevtPMTlL*8UrzHz7=rZNu zK~h&`95-2zQJww7$(qERQ#F(A8GqKp-0{vjF8IKvC&f)n3=AUL3=D!mcli3dxcUS` z9Ad1Ol$i&1$c7s=i6C5B!Og(P@|BT+0qm8xGXwK41&AE?_b#0K>%fVm8iTH5s%mLk zN7!qmd2W_8C)~F9_;#0(g66hqVK>G!qXq@{n8gJ zFhh7!+RdL6w|)Qre&_P%3*YYDej`r%@8W`=@2ZsEPjX|mFuF3Wd`98<%Gjm9y03&W ze4Dx_bp16Ov5R4OcW(JhY;)I<=;fTWV9$Zz)Pu^6;@uo^0Zo;mf;Q$Kgx<62KQ^0D zeq3-*Q|_gA&zPg@KWzGUFYc)6<@|qoA1=rQTQ(`2_!7gjn;}IfcA{4NHr==9n}yk9wUZI;eHRc5&B zsQHV$$(HwD>x=1p&C-4Lv#t~>9TK-HtqCc)bTV_IAD`uJ2~%;SQf|3u(F=bJ z_B-k^shGyL$LItEd4+8HcIH-VdyK2e-W6ZZYtCH6SR=QQBTzT~#Mi5=i?=L2$Q54P zHY3>d$eho|3jM0Cubo=ba6aZ_cKxp8Lt9%NT(6zga?q61P))96*j||uq8>Lne(t@= zQQEH?HwkEDUM-Ie*f}Y@(^=uHvU21j-H%c0Em!rHdYp~|EI>5V@_gsh za28$8)5{lMz5HR-tN2fU#BN=F5;-f-_T>LF#*^#=ycwC~n6c!o$^J}QpiDIRB9ja! zJjYC4$RsMA2+VhoJXe&Ml9>-l>8uRQz-$Ck%?!#nADE<>nHd=-D>90(0i}Rh2qcw= onQbJ1hC#rRMpIyB!jg%A`mto70B=?{kVY0Dj0EN?CRPv+09M4Rp#T5? delta 329 zcmey!bB@g_z?+#xgn@y9gCVRvI#`_j$a7&J4<{9