From f4ae4a6d4810ace3db21877af2999e472acf4149 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Tue, 26 Oct 2021 23:10:25 +0200 Subject: [PATCH] More unit tests --- radio/src/tests/conversions.cpp | 200 ++++++++++-------- radio/src/tests/eeprom_22_x7.bin | Bin 32768 -> 0 bytes radio/src/tests/eeprom_22_x9d+.bin | Bin 32768 -> 0 bytes .../{eeprom_22_xlite.bin => eeprom_23_x7.bin} | Bin 32768 -> 32768 bytes radio/src/tests/eeprom_23_xlite.bin | Bin 0 -> 32768 bytes radio/src/tests/lcd.cpp | 2 + 6 files changed, 118 insertions(+), 84 deletions(-) delete mode 100644 radio/src/tests/eeprom_22_x7.bin delete mode 100644 radio/src/tests/eeprom_22_x9d+.bin rename radio/src/tests/{eeprom_22_xlite.bin => eeprom_23_x7.bin} (70%) create mode 100644 radio/src/tests/eeprom_23_xlite.bin diff --git a/radio/src/tests/conversions.cpp b/radio/src/tests/conversions.cpp index 4c1cea56a..e83b3640e 100644 --- a/radio/src/tests/conversions.cpp +++ b/radio/src/tests/conversions.cpp @@ -39,11 +39,13 @@ void loadEEPROMFile(const char * filename) } #endif -#if defined(PCBX9DP) && (defined(EEPROM) || defined(EEPROM_RLC)) +#if defined(PCBX9DP) TEST(Conversions, ConversionX9DPFrom23) { #if defined(SDCARD_YAML) - simuFatfsSetPaths(TESTS_BUILD_PATH "/model_x9dp/", TESTS_BUILD_PATH "/model_x9dp/"); + simuFatfsSetPaths(TESTS_BUILD_PATH "/", TESTS_BUILD_PATH "/"); + sdCheckAndCreateDirectory(RADIO_PATH); + sdCheckAndCreateDirectory(MODELS_PATH); #endif loadEEPROMFile(TESTS_PATH "/eeprom_23_x9d+.bin"); @@ -102,6 +104,12 @@ TEST(Conversions, ConversionX9DPFrom23) TEST(Conversions, ConversionX9DPFrom23_2) { +#if defined(SDCARD_YAML) + simuFatfsSetPaths(TESTS_BUILD_PATH "/", TESTS_BUILD_PATH "/"); + sdCheckAndCreateDirectory(RADIO_PATH); + sdCheckAndCreateDirectory(MODELS_PATH); +#endif + loadEEPROMFile(TESTS_PATH "/eeprom_23_x9d+2.bin"); eepromOpen(); @@ -125,106 +133,130 @@ TEST(Conversions, ConversionX9DPFrom23_2) } #endif -// #if defined(PCBXLITE) && !defined(PCBXLITES) -// TEST(Conversions, ConversionXLiteFrom22) -// { -// loadEEPROMFile(TESTS_PATH "/eeprom_22_xlite.bin"); +#if defined(PCBXLITE) && !defined(PCBXLITES) +TEST(Conversions, ConversionXLiteFrom23) +{ +#if defined(SDCARD_YAML) + simuFatfsSetPaths(TESTS_BUILD_PATH "/", TESTS_BUILD_PATH "/"); + sdCheckAndCreateDirectory(RADIO_PATH); + sdCheckAndCreateDirectory(MODELS_PATH); +#endif -// eepromOpen(); -// eeLoadGeneralSettingsData(); -// convertRadioData_218_to_219(g_eeGeneral); -// eeConvertModel(0, 218); -// eeLoadModel(0); + loadEEPROMFile(TESTS_PATH "/eeprom_23_xlite.bin"); -// EXPECT_EQ(-30, g_eeGeneral.vBatMin); -// EXPECT_EQ(8, g_eeGeneral.speakerVolume); -// EXPECT_EQ('e', g_eeGeneral.ttsLanguage[0]); -// EXPECT_EQ('n', g_eeGeneral.ttsLanguage[1]); + eepromOpen(); +#if defined(EEPROM) + eeLoadGeneralSettingsData(); + convertRadioData_219_to_220(g_eeGeneral); +#else + convertRadioData_219_to_220(); + convertRadioData_220_to_221(); + EXPECT_EQ(nullptr, loadRadioSettingsYaml()); +#endif + eeConvertModel(0, 219); + loadModel((uint8_t)0); -// EXPECT_EQ(SWSRC_TELEMETRY_STREAMING, g_eeGeneral.customFn[0].swtch); -// EXPECT_EQ(FUNC_LOGS, g_eeGeneral.customFn[0].func); -// EXPECT_EQ(20, g_eeGeneral.customFn[0].all.val); + EXPECT_EQ(-30, g_eeGeneral.vBatMin); + EXPECT_EQ(8, g_eeGeneral.speakerVolume); + EXPECT_EQ('e', g_eeGeneral.ttsLanguage[0]); + EXPECT_EQ('n', g_eeGeneral.ttsLanguage[1]); -// EXPECT_ZSTREQ("Tes", g_eeGeneral.switchNames[0]); -// EXPECT_EQ(SWITCH_3POS, SWITCH_CONFIG(0)); + EXPECT_EQ(SWSRC_TELEMETRY_STREAMING, g_eeGeneral.customFn[0].swtch); + EXPECT_EQ(FUNC_LOGS, g_eeGeneral.customFn[0].func); + EXPECT_EQ(20, g_eeGeneral.customFn[0].all.val); -// EXPECT_ZSTREQ("Test", g_model.header.name); -// EXPECT_EQ(MODULE_TYPE_R9M_PXX1, g_model.moduleData[EXTERNAL_MODULE].type); -// EXPECT_EQ(MODULE_SUBTYPE_R9M_EU, g_model.moduleData[EXTERNAL_MODULE].subType); -// EXPECT_EQ(80, g_model.mixData[0].weight); -// EXPECT_EQ(80, g_model.expoData[0].weight); -// EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.mixData[4].srcRaw); -// EXPECT_EQ(SWSRC_TELEMETRY_STREAMING, g_model.mixData[4].swtch); -// EXPECT_EQ(SWASH_TYPE_120X, g_model.swashR.type); -// EXPECT_ZSTREQ("Thr", g_model.inputNames[0]); + EXPECT_STRNEQ("Tes", g_eeGeneral.switchNames[0]); + EXPECT_EQ(SWITCH_3POS, SWITCH_CONFIG(0)); -// EXPECT_ZSTREQ("Tes", g_model.telemetrySensors[0].label); -// EXPECT_EQ(10, g_model.telemetrySensors[0].id); -// EXPECT_EQ(8, g_model.telemetrySensors[0].frskyInstance.physID); -// EXPECT_EQ(-100, g_model.limitData[0].max); // 90.0 + EXPECT_STRNEQ("Test", g_model.header.name); + EXPECT_EQ(MODULE_TYPE_R9M_PXX1, g_model.moduleData[EXTERNAL_MODULE].type); + EXPECT_EQ(MODULE_SUBTYPE_R9M_EU, g_model.moduleData[EXTERNAL_MODULE].subType); + EXPECT_EQ(80, g_model.mixData[0].weight); + EXPECT_EQ(80, g_model.expoData[0].weight); + EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.mixData[4].srcRaw); + EXPECT_EQ(SWSRC_TELEMETRY_STREAMING, g_model.mixData[4].swtch); + EXPECT_EQ(SWASH_TYPE_120X, g_model.swashR.type); + EXPECT_STRNEQ("Thr", g_model.inputNames[0]); -// EXPECT_EQ(LS_FUNC_VPOS, g_model.logicalSw[0].func); -// EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.logicalSw[0].v1); -// EXPECT_EQ(0, g_model.logicalSw[0].v2); + EXPECT_STRNEQ("Tes", g_model.telemetrySensors[0].label); + EXPECT_EQ(10, g_model.telemetrySensors[0].id); + EXPECT_EQ(8, g_model.telemetrySensors[0].frskyInstance.physID); + EXPECT_EQ(-100, g_model.limitData[0].max); // 90.0 -// EXPECT_EQ(TELEMETRY_SCREEN_TYPE_VALUES, g_model.screensType & 0x03); -// EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.screens[0].lines[0].sources[0]); -// EXPECT_EQ(MIXSRC_TIMER3, g_model.screens[0].lines[0].sources[1]); -// } -// #endif + EXPECT_EQ(LS_FUNC_VPOS, g_model.logicalSw[0].func); + EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.logicalSw[0].v1); + EXPECT_EQ(0, g_model.logicalSw[0].v2); -// #if defined(PCBX7) -// TEST(Conversions, ConversionX7From22) -// { -// loadEEPROMFile(TESTS_PATH "/eeprom_22_x7.bin"); + EXPECT_EQ(TELEMETRY_SCREEN_TYPE_VALUES, g_model.screensType & 0x03); + EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.screens[0].lines[0].sources[0]); + EXPECT_EQ(MIXSRC_TIMER3, g_model.screens[0].lines[0].sources[1]); +} +#endif -// eepromOpen(); -// eeLoadGeneralSettingsData(); -// convertRadioData_218_to_219(g_eeGeneral); -// eeConvertModel(0, 218); -// eeLoadModel(0); +#if defined(PCBX7) +TEST(Conversions, ConversionX7From23) +{ +#if defined(SDCARD_YAML) + simuFatfsSetPaths(TESTS_BUILD_PATH "/", TESTS_BUILD_PATH "/"); + sdCheckAndCreateDirectory(RADIO_PATH); + sdCheckAndCreateDirectory(MODELS_PATH); +#endif -// EXPECT_EQ(-30, g_eeGeneral.vBatMin); -// EXPECT_EQ(8, g_eeGeneral.speakerVolume); -// EXPECT_EQ('e', g_eeGeneral.ttsLanguage[0]); -// EXPECT_EQ('n', g_eeGeneral.ttsLanguage[1]); + loadEEPROMFile(TESTS_PATH "/eeprom_23_x7.bin"); -// EXPECT_EQ(SWSRC_TELEMETRY_STREAMING, g_eeGeneral.customFn[0].swtch); -// EXPECT_EQ(FUNC_LOGS, g_eeGeneral.customFn[0].func); -// EXPECT_EQ(20, g_eeGeneral.customFn[0].all.val); + eepromOpen(); +#if defined(EEPROM) + eeLoadGeneralSettingsData(); + convertRadioData_218_to_219(g_eeGeneral); +#else + convertRadioData_219_to_220(); + convertRadioData_220_to_221(); + EXPECT_EQ(nullptr, loadRadioSettingsYaml()); +#endif + eeConvertModel(0, 219); + loadModel((uint8_t)0); -// EXPECT_ZSTREQ("Tes", g_eeGeneral.switchNames[0]); -// EXPECT_EQ(SWITCH_3POS, SWITCH_CONFIG(0)); + EXPECT_EQ(-30, g_eeGeneral.vBatMin); + EXPECT_EQ(8, g_eeGeneral.speakerVolume); + EXPECT_EQ('e', g_eeGeneral.ttsLanguage[0]); + EXPECT_EQ('n', g_eeGeneral.ttsLanguage[1]); -// EXPECT_ZSTREQ("Test", g_model.header.name); -// EXPECT_EQ(MODULE_TYPE_R9M_PXX1, g_model.moduleData[EXTERNAL_MODULE].type); -// EXPECT_EQ(MODULE_SUBTYPE_R9M_EU, g_model.moduleData[EXTERNAL_MODULE].subType); -// EXPECT_EQ(80, g_model.mixData[0].weight); -// EXPECT_EQ(80, g_model.expoData[0].weight); -// EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.mixData[4].srcRaw); -// EXPECT_EQ(SWSRC_TELEMETRY_STREAMING, g_model.mixData[4].swtch); -// EXPECT_EQ(SWASH_TYPE_120X, g_model.swashR.type); -// EXPECT_ZSTREQ("Thr", g_model.inputNames[0]); + EXPECT_EQ(SWSRC_TELEMETRY_STREAMING, g_eeGeneral.customFn[0].swtch); + EXPECT_EQ(FUNC_LOGS, g_eeGeneral.customFn[0].func); + EXPECT_EQ(20, g_eeGeneral.customFn[0].all.val); -// EXPECT_ZSTREQ("Tes", g_model.telemetrySensors[0].label); -// EXPECT_EQ(10, g_model.telemetrySensors[0].id); -// EXPECT_EQ(9, g_model.telemetrySensors[0].frskyInstance.physID); -// EXPECT_EQ(-100, g_model.limitData[0].max); // 90.0 + EXPECT_STRNEQ("Tes", g_eeGeneral.switchNames[0]); + EXPECT_EQ(SWITCH_3POS, SWITCH_CONFIG(0)); -// EXPECT_EQ(10, g_model.flightModeData[0].gvars[0]); -// EXPECT_ZSTREQ("FMtest", g_model.flightModeData[1].name); -// EXPECT_EQ(45, g_model.flightModeData[1].swtch); -// EXPECT_ZSTREQ("Tes", g_model.gvars[0].name); + EXPECT_STRNEQ("Test", g_model.header.name); + EXPECT_EQ(MODULE_TYPE_R9M_PXX1, g_model.moduleData[EXTERNAL_MODULE].type); + EXPECT_EQ(MODULE_SUBTYPE_R9M_EU, g_model.moduleData[EXTERNAL_MODULE].subType); + EXPECT_EQ(80, g_model.mixData[0].weight); + EXPECT_EQ(80, g_model.expoData[0].weight); + EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.mixData[4].srcRaw); + EXPECT_EQ(SWSRC_TELEMETRY_STREAMING, g_model.mixData[4].swtch); + EXPECT_EQ(SWASH_TYPE_120X, g_model.swashR.type); + EXPECT_STRNEQ("Thr", g_model.inputNames[0]); -// EXPECT_EQ(LS_FUNC_VPOS, g_model.logicalSw[0].func); -// EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.logicalSw[0].v1); -// EXPECT_EQ(0, g_model.logicalSw[0].v2); + EXPECT_STRNEQ("Tes", g_model.telemetrySensors[0].label); + EXPECT_EQ(10, g_model.telemetrySensors[0].id); + EXPECT_EQ(9, g_model.telemetrySensors[0].frskyInstance.physID); + EXPECT_EQ(-100, g_model.limitData[0].max); // 90.0 -// EXPECT_EQ(TELEMETRY_SCREEN_TYPE_VALUES, g_model.screensType & 0x03); -// EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.screens[0].lines[0].sources[0]); -// EXPECT_EQ(MIXSRC_TIMER3, g_model.screens[0].lines[0].sources[1]); -// } -// #endif + EXPECT_EQ(10, g_model.flightModeData[0].gvars[0]); + EXPECT_STRNEQ("FMtest", g_model.flightModeData[1].name); + EXPECT_EQ(45, g_model.flightModeData[1].swtch); + EXPECT_STRNEQ("Tes", g_model.gvars[0].name); + + EXPECT_EQ(LS_FUNC_VPOS, g_model.logicalSw[0].func); + EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.logicalSw[0].v1); + EXPECT_EQ(0, g_model.logicalSw[0].v2); + + EXPECT_EQ(TELEMETRY_SCREEN_TYPE_VALUES, g_model.screensType & 0x03); + EXPECT_EQ(MIXSRC_FIRST_TRAINER, g_model.screens[0].lines[0].sources[0]); + EXPECT_EQ(MIXSRC_TIMER3, g_model.screens[0].lines[0].sources[1]); +} +#endif #if 0 //TODO defined(PCBX10) && !defined(RADIO_FAMILY_T16) TEST(Conversions, ConversionX10From22) diff --git a/radio/src/tests/eeprom_22_x7.bin b/radio/src/tests/eeprom_22_x7.bin deleted file mode 100644 index 5f9381631d3653b6f49e8430c9db9e5c9d64e655..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmd_yWl&TL7>Dt5b}6wCvAeMqyRo}4u>H+&7lG|GBdje+Tm|Jh+N%o}#!wid6_c55ZKVU30d z3=Ieh*x(*!Nf7Q9c`Z1%uy!czfA?9+gekE#FxrQDxQ7nv>z= zxJ*=}X$G3L>}G9ifSbi}<6(8&Bz1D!qzwrRO8N7ir3P8<75~xBhOL!pwO2pjUD+`; z>}IIXkEmw1#6(rQHPlDYZ`;h`Vpv0dJMB2(XIlJCcYjxxxKWNTFUvmD>6bUF<6S>b z$0=9i*AK*;{qu8fzxsc#`RCfnjP+k1?szJPSj-T6gsqKfvAfw0xCFa-*g_*552$+_ zuTL+{kI~N2Up=3Hvo$o`r@1>m-7sPveGBC)7+dLt#gR~MT%{8hPeQrzl}?z4gmM!o zoiI-c zODmyV`VC8Z<^2lFAfeohN+&FngmN=0ovkc4szE1j?+63Q*Abi#^BD7U!M z2`eF?+>%NstdxXueU(mFX$j?)Q95DzpZsI4P);tS-115%tb&AcD=M9^N)pPgtaQSv zNGP|e(g~|3q1@_9C#;5qa%(D`uv!wzt*vyz{3MiHN9lysl~8Uyr4v?PLb(l;PFO<; z<@zg~utpNfb^HPt9ZirnjHb{xgT6WREue1+eJki&LmvQrAoOjZZwq}p=-Wfz0s4;6 zcY?k%^j)Cu3Vk=|yF=dt`kv7Dg1$HOeW33PeLv{?Lq7oefzS_velYYyptnIE1pQFx zhe1Ca`Vr8NgnktCqoE%I{aEP7K|db)3D8f3eiHPPp`QZ19r|GCr$Rps`svWmfPNgMK;mE1+Kq{VM2JL%#<4 zwa~AFem(RXpx+4nCg?XqzXkfO&~Jl&JM=rC-wFLL=yyZE2l~Cx?}L6n^ar3n2z@y8 zhoCV^e>=)3H>YR zUqk-}`nS-(gFYJi_t1ZU{v-6Cp#Kd07wEr2{|)-Tp#K~C@6bE`@c=qZ=q=D&p?8Ab z8G0A!U7>e_J{I)u(8q>84)k%Mj|Y8x=sloM0KF&l38D9bJ`wbZp-%#RQs|RGpB(xW z(5Hkx74)g0PXm2g=+i-;9{LQ>XM{cz^qHa00=+l%S)tDceRk+`K%W!(T+ru+J`ePH zq4$A4AN2X5F93Z(=nFw#82Td67lpnU^u?hs0ewm6OF{1oeQD^+KwlR6a?qEDz5?_W zp|1peW$3FwUlsal&{v1P2J|(duLXT==>4Ft1ASfS>p@>1`UcQ9gx(+eM$k8gz6tbA zp>GC#bLd+@-xB&((6@#@0Qx}a+d$tI`gYK_hrR>!9ii_8eP`&qK;ISmZqRp!z6bO@ zq3;EKZ|M6#-xvCR(D#Ra0Q3W)9|Zki=!ZaWgFXoQq0kS5emL|apdShSDCkE+KL+}- z(2s+DJoFQwp9uXV=qE!z1$sO5!O%~Iej4=Cp`QW$Oz3ApKO6cv(9eZ_9`y5}UjTgw z^b4U6g+2`WMbIyXehKtTpw~V81%=XKLPzo z=ubg^8u~NPpN0M$^yi_!0R2ViFF}79`YX_1h5j1!*P*`w{Y~g^L4OS{vPxZ z&__alANmK-KZO1f^pBx`0{v6ypF#f|`Y7mMK>rf@SJ1zP{tfhRp??Q`H1zMG{{a0* W=s!XK8Tv2Ke}(=V^yrW09rz!nX?EWL diff --git a/radio/src/tests/eeprom_22_x9d+.bin b/radio/src/tests/eeprom_22_x9d+.bin deleted file mode 100644 index 8bc63bd4a6879c193aa1ac349c4a46621fa5e9ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmd_xd6bo70LStB-aAuc5>p1HkT%gGLx^ZW&9oRNK$FJEo4c{ZK8ddlzkg1 zm8~%-T5KT^l_j)LCdEW<<@|I;f7I`Lj(@!OocDasbI<2_?t7p2k9*#8Zel1X5vmso zMM4cyl0$>f2>p+aAb!2!P(o_Kwyo*mAZQ#U_6=Ibg4U7Dq;UL{5{aKmB}5N*vghgL~F#HNR9CN9`FD877`NGO!D zV{6ms-|O#R>1bAuMvEN${QGBbA5PhvlX=KG%H~11W02gvWROt!)uw3ZaHB^)mK6H; zoJXz`f@2E%1G^IK5rkt&(cB{OQ_jZtb@Yj(?%AFd?9R_h%rD3)xn*y3K#)8!Ikg}Z z+IH|VyLdN#F?jzZ!uzK<+`r@C{vBWV`wtS@9L@fv6!!n|{+0B$UFrmt7pWeTI#K1t zNgk6rS>;73k4cqQd2x!zq{^tgDC;q)Q&nD^<}s<$RbG_ym=yiNQeHE8QNd$U6;)nT z@|aX*l^17vOsa~?i?ci?b+*cjsveW7rt+e?$E0egyg0{WQZ-dxoa-^EG?f?Uc}(hj zl^3-Z!b_?=h(cDlabg znA8<2FRt{MR6~^)jXWlmuJR(oV^WP(UNrHTR8y4~%{(U6T;)Xzk4d#udC|&aQdg z*bOQ#ZuFQ`rpk-19+T>(@}j%Pq;67q(Zgd>H>Nb@Z zeLN<0yUL5c9+SF5X$RprGrk4a5ec`?IdQZrRv z%<`DjY?T+;9+R4*^5PMXNzGMxG0$UCkE*P3|o3p^&ZQ02u-9+O(6@?x>aq?V|>c-do8uc*9u z)nihxsl0gIV^T|1UgUaA>J60_c^;E`Q{}~59+P@o<;60ONiA1-@s7u&-c@O7w>sY>V1_LA9zgaLzNdFc}!}J%8QRZCiRKRi%&f!wN~ZDXC9MUr}E-+ zk4b%@@?yQmq`p*n@s-DF|wOXyoce--qtp}!jXYoKof{k71yh5kC|+douR)T`YzDl z0R4^7XF}f<`fkv7hyEt$dq96P^tV9Y6Z&4z_lEvf=x>9*5A?S~-xvBjpzjC$ozVA( zegO0Xp}!0ILC_C|ehBnKp^rj84Eo{FkAQw8^mjvl5A>s;zZd%ZpuZpb2cRDf{e#et zfqpFX@) z0{vX*=RyA{^p8RRIP_0I|0MKJLH{)L&p`hy^v^;6JoGuxzX1Jw=wF0>0rU%@e+l|U z&@YC53G^>R{|fZ4LjM}{uS35S`dsMWfIbiUH=%zE`nRE92K{pA-+}&J=vP3$68crp zuZI3T=--F_1L!}5{v+tuK>soHpFsa9^lPF24ElA@e-8Z@(65L7OX$CXegpIyq2C1k z*U*0h{kPD62mNN~zlZ(@=zoNM3-nu|-v<45=zoI#XXtl8zZ3djpwEYX7xceEzZ?2J V(EkSg@6Z=OzZZJvKl6v0zW^rH>9GI+ diff --git a/radio/src/tests/eeprom_22_xlite.bin b/radio/src/tests/eeprom_23_x7.bin similarity index 70% rename from radio/src/tests/eeprom_22_xlite.bin rename to radio/src/tests/eeprom_23_x7.bin index 54affdd23aa345ee8698b4cc5b292fb6cc0750dd..10e2a723312eee5b87f59ee39ff4007614b5f7f1 100644 GIT binary patch delta 461 zcmZo@U}|V!5@2OuaxG#KJk0Uv#w2~FE2()30-Gx|MCuX1laYPve>RcdZxb09m<2w*37aTr$;dL9 zkx|iU;YK-xIvA^l>46QH&B~C($UM>apoS-q@|(!G&UD z0|UbBkNg|gPZs(8Hf^H!MCOG?9~lu+xLMc@V4mnRkqKnPL}mhpvEcQ|ThW>XW*cwmm6i%rXk2Hu5Odpg!AU!L6cGARfq2t)t2%Zp`SBnmi}7OiJv( z(J&}Dd*-bPYi`4*=L`}Vl9I3zsK!@ za6Fn8^Ou~?4+DJKsECvp>WPZi!93Z0I%3X;Y|^Pb|&HJRZcJH9j4$$1s> zIg)Uqf;lL^BMB!-FbAFQNWv)~n1e2GB;i~rn1c#Bl5mm*b5J2i5>8>k9CVQ*2`5D` z2VLw)!YLw{gNizmaEb}$pi3M{IF}0MpvxRdIK>5X(B+OKoGS!#(3OrPoK(Rabd@6s zr-Wb*D(OhVxmqv>UE@f?DJ7VLN;{Hp$_VD5vW_I2YXx&qIY$!Cb%Hslydw#xf?y7+ z=t#n;B$$J)cO>Cd7R*6a97#Ag2=AgQcB%FGJIjFuP38#Tz4r=H~ z!nsp02Q_je;WQS^K}{S8*i9MsQ|g!6=84tmm&gwtOz2R-FT!g*RS z2gMvoI9Y-@Xn-RLXP{sX8stdAc}6e?J?luqc}_3~4R$2q3=zyhLmf#t!vu5C^Nu8( z;et76gd+)Oq+kwu!I6aXqF@e+JCbll3Fe^DjwGBhf;s3VM-tA%s~?zNjMV)bI>G563$zKIp}Ri63#n< zIcTyY31^C64w~vn!g*IP2TgM%;k+l9gQh!@aApYRpqY*&oLPc7XtpB>=Y7E(G{=#I zGgmMNec(vK`A{$iedI{O`B*Rq&2uE-%oof-3mi!}3k7q~B1aO=CxSU>u_Fm*iC_*| z>PW&_CYXbkJCbl#2M763%A99Q2JN3FlkE9Q2(d31^F74%+HS z!ueh>2W@jC;cOSoK|eT>aCQjhpq-8+oE*U%^rIsQ=O@7&^s^%g=NG{ow9Ao%vs*9+ z?QtaG{3@7(_BxVq_6g>o{f;D@1A;l|pd$(AkYElv>`1~nBAA1YI+Ad51#{3bM-t9) z!5nnLk%V(nFbDnSNW%GDFbAD-B;lME%t3!Rl5qYM%t3!Sl5zqC&&>kZhhZOqeFE$g zVSgU%^T9p}`~0v^g8lihF97=sV1FU(3&K7b_Jv?y81@&zJ_Ys{!@daYi^9Gb>@R`+ zrLeyY_Qhd;Iqa{1{gtp!h5c2qF9G|Ku)iAi*TB9M>`TMG4D8Fo{#w|VgZ*`|FAw_) zu&)UFO0d5k_LX5@1@%qQ0>>I$oA?)vjeIwX6hJ6#*H--IOux|$Y=CE%8`o2*tdawTiCaQ{r#|S5Bm<7SpAnXUh{u$Um3;X9_KN$8yU_TW0!(jhB?1#gC1nft`{sq{-2>UqfN5OtH?8m_V zCD^|V`&VH9D(qi_{p+xQ1NLKKKMwZeVV@2AH(@^k_7h=03HEQn{%zR51N+Iap91@- zuzwf!(_sG|?5D$i2JC0TeirO!!~T8P&w>41*na@~4`Kfi>_3M6JlM~N{Q}r8g#9Ae ze**i(uwMfErLbQH`{l4-0sBv3zY_MVVE-BHKZpGnu>TVFt6{$e_FuvNYuK-a{W{pM zhy4cFZ-o6O*l&jYH?aQ}_TRyN3+%VT{(IPOgZ*~c{{Z_Pu-^&$9N7N|`=4O{GwgqX z{Vv$=hW#Gc{|fuPu-^y!{jfg(`-8AQ1pC9VKLY!su+N44G1wo6{R!Bgg#B-@{~h+H OV1F9+=l(-p8-D|IBx=L} literal 0 HcmV?d00001 diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp index 71947cad5..fe97b97a7 100644 --- a/radio/src/tests/lcd.cpp +++ b/radio/src/tests/lcd.cpp @@ -282,6 +282,7 @@ TEST(Lcd, DrawSwitch) #if defined(PCBTARANIS) && LCD_W >= 212 TEST(Lcd, BMPWrapping) { + simuFatfsSetPaths("",""); lcdClear(); uint8_t bitmap[2+40*40/2]; lcdLoadBitmap(bitmap, TESTS_PATH "/plane.bmp", 40, 40); @@ -349,6 +350,7 @@ public: #if defined(PCBTARANIS) && LCD_W >= 212 TEST(Lcd, lcdDrawBitmapLoadAndDisplay) { + simuFatfsSetPaths("",""); lcdClear(); // Test proper BMP files, they should display correctly {