From 46a5ea1377be2ae0c60a21e5c6381240acdbea7e Mon Sep 17 00:00:00 2001 From: bsongis Date: Mon, 25 Aug 2014 11:51:15 +0200 Subject: [PATCH] RSSI initialization added in google tests --- radio/src/tests/frsky.cpp | 27 ++++++++++-------- .../one_sensor_votages_screen_212x64.png | Bin 640 -> 904 bytes .../two_sensor_votages_screen_212x64.png | Bin 706 -> 980 bytes 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/radio/src/tests/frsky.cpp b/radio/src/tests/frsky.cpp index 74fd0f043..9aff7bacb 100644 --- a/radio/src/tests/frsky.cpp +++ b/radio/src/tests/frsky.cpp @@ -41,6 +41,10 @@ #define SWAP_DEFINED #include "opentx.h" +#define TELEMETRY_RESET() \ + memclear(&frskyData, sizeof(frskyData)); \ + frskyData.rssi[0].value = 100 + extern bool checkScreenshot(QString test); #if defined(FRSKY) && !defined(FRSKY_SPORT) @@ -175,10 +179,11 @@ void generateSportCellPacket(uint8_t * packet, uint8_t cells, uint8_t battnumber TEST(FrSkySPORT, frskySetCellVoltage) { - memclear(&frskyData, sizeof(frskyData)); uint8_t packet[FRSKY_SPORT_PACKET_SIZE]; - //test that simulates 3 cell battery + TELEMETRY_RESET(); + + // test that simulates 3 cell battery generateSportCellPacket(packet, 3, 0, _V(410), _V(420)); frskySportProcessPacket(packet); EXPECT_EQ(checkSportPacket(packet), true) << "Bad CRC generation in setSportPacketCrc()"; generateSportCellPacket(packet, 3, 2, _V(430), _V( 0)); frskySportProcessPacket(packet); @@ -272,7 +277,7 @@ TEST(FrSkySPORT, frskySetCellVoltage) TEST(FrSkySPORT, StrangeCellsBug) { - memclear(&frskyData, sizeof(frskyData)); + TELEMETRY_RESET(); uint8_t pkt[] = { 0x7E, 0x48, 0x10, 0x00, 0x03, 0x30, 0x15, 0x50, 0x81, 0xD5 }; EXPECT_EQ(checkSportPacket(pkt+1), true); frskySportProcessPacket(pkt+1); @@ -283,10 +288,10 @@ TEST(FrSkySPORT, StrangeCellsBug) TEST(FrSkySPORT, frskySetCellVoltageTwoSensors) { - //telemetryReset(); - memclear(&frskyData, sizeof(frskyData)); uint8_t packet[FRSKY_SPORT_PACKET_SIZE]; + TELEMETRY_RESET(); + //sensor 1: 3 cell battery generateSportCellPacket(packet, 3, 0, _V(418), _V(416)); frskySportProcessPacket(packet); generateSportCellPacket(packet, 3, 2, _V(415), _V( 0)); frskySportProcessPacket(packet); @@ -366,7 +371,7 @@ TEST(FrSkySPORT, frskyVfas) uint8_t packet[FRSKY_SPORT_PACKET_SIZE]; //telemetryReset(); - memclear(&frskyData, sizeof(frskyData)); + TELEMETRY_RESET(); // tests for Vfas generateSportFasVoltagePacket(packet, 5000); frskySportProcessPacket(packet); @@ -399,8 +404,7 @@ TEST(FrSkySPORT, frskyCurrent) { uint8_t packet[FRSKY_SPORT_PACKET_SIZE]; - //telemetryReset(); - memclear(&frskyData, sizeof(frskyData)); + TELEMETRY_RESET(); g_model.frsky.fasOffset = -5; /* unit: 1/10 amps */ // tests for Curr @@ -408,7 +412,7 @@ TEST(FrSkySPORT, frskyCurrent) EXPECT_EQ(frskyData.hub.current, 0); EXPECT_EQ(frskyData.hub.maxCurrent, 0); - //measured current less then offset - value should be zero + // measured current less then offset - value should be zero generateSportFasCurrentPacket(packet, 4); frskySportProcessPacket(packet); EXPECT_EQ(frskyData.hub.current, 0); EXPECT_EQ(frskyData.hub.maxCurrent, 0); @@ -425,9 +429,8 @@ TEST(FrSkySPORT, frskyCurrent) EXPECT_EQ(frskyData.hub.current, 195); EXPECT_EQ(frskyData.hub.maxCurrent, 495); - //test with positive offset - //telemetryReset(); - memclear(&frskyData, sizeof(frskyData)); + // test with positive offset + TELEMETRY_RESET(); g_model.frsky.fasOffset = 5; /* unit: 1/10 amps */ generateSportFasCurrentPacket(packet, 0); frskySportProcessPacket(packet); diff --git a/radio/src/tests/one_sensor_votages_screen_212x64.png b/radio/src/tests/one_sensor_votages_screen_212x64.png index e394794ab566537c2793ef849549be537cc74fdf..6c1e918a244b760def96682e5e05be3b11f52877 100644 GIT binary patch delta 846 zcmV-U1F`&o1&9ZbM}Gq=NklJg5bSR{?KC@ zJ|%?k^4>du9=v-S0M7;SK{pT|bOZ50HxM6m1MxvO5Fd17a`AmWA4{8kGjUOE15WdB z`by}@pJtZrv)LtgjZe@1aBCAb78lhvppsQy=*bJee8P?@r+?y~q@RvZ8l(C=(F<3J zZ&QZ%KK!DT-!(oRT3#FTZPut}mE6rfmk_Nz*~oa2-PSvUO*l5Yv+o)D zYm8s9|70-nxm8t`KWWjQ7zmd3;-WYO3nGY89eeF;_af{fFluyvEPjaW>}+prcq;BL zyxlrfr{|l)VSl%uJYQY*LW+6vy~TjxAT@!bjWM4Hfz^v@8&KIRFX2f&=9^=bK`xCs z8W#V!DZX(}k=PEC^S28n}OckKqCyk;ED^IbLD4Tt&t#n|2SZ;#r5 z@>+6YElQ91_I+PsP4!a?hjM}B`Kn{_gweJ;)6QagTJv03*esE*E5%6#0Pb-M(U>qRL&n0VuB-M}H$@Wwu+T!#w+TAI6EbsOY}k^7&ml zTTyaq;ZQD6B&9t2c8d`Mm+IIT4uuj*-pRq1*I*_PA9MrpK{pT|bOZ50HxM6m1MvaC z^B~C#-FSs3Ss{vQ@_ljnb4r+aY0LSlYDr6n63Yc-R|{prAxcjh8UxSbtC%z_;@FpA zibs#!1HXAtm%m}xeUB!w0$@>dDoz0o@i*+MJ7_HB^;EgRY5rqAF_UoGz>4x5ad16; Y0mXcTog%=@I{*Lx07*qoM6N<$f(cxrf&c&j delta 580 zcmV-K0=xZ)2Y>~TM}Gn%NklkH|>H6LqWzEMAU}=TRD!K z@!|~_MWjav!2uRt);EBC5k8n9d@w`!V21F)4B>+r!Ur>i4^zDNkIs1S(@Vk!O}EJl zA%qa(Nx}y;FqY=Nnig12yV=u%TAx%WE^h0I{$~oe!F3>wJJB`uSjkem>Z^ z?dL1rC4A7)|9|k8uB6lgH9h5#JfnmUI(q7S#puYiizUQ>U>zGo`TymGU0=c#>3y$Ta;R$Ml7;4LP_|bL#*?)*TRGkOVpdu@}&m- zd{CgjZ@1pY3v}x5=M(nr7P~w?a>Mu%J^g&?Kq$2kIDd?}?dL08?%QS9!y^NMk@xMA zJPdfcP7q2hBo6~L_wBOa#SF2ZkA1t)L_Z(?CBg?Ygb!v2AIuOwm?3;HL-=5ZIv;@j z9M(5rAT@Kl>i5xI_0^dRZR~93!{sf@2^MH2bLAboW}? zFfjJ#Jv}KTskb%_pPL)W@<+y*Yc{v(v>QDd`DR8+i1r=%a>W+D;$8j|=ORB=Z-Dre SJo*X%0000+jfK?3`Ln){ZGG*KkdV`l!kyo;tltHl8Z|w z9wY>4Uopl2a0c(Q8vxG*@xf^zJ~$1;2d9Df;4}~)oCe~9)0kX*%d%MNl+{G0T4x&4 zPg{Nwr6Rv=4fS?4`Q_4jOFPPF_DHGm>8m%UI(cQ0sn(g2(tiRXGgK^=D3#Z++_YLZm-hS z=T7XR?aHUaZ?j&_d#=5~n@u>9T~_-d`a78TOP<+&P5Vwb_8|9L$7?2y=8mw)6v>In z9iC8;j?o(V+p&s4oZTh9Kx1Ttl zFRC%~>y&(_fhKp7CNQ+o=M&?snyJ`PN1D9&p7Y2p1`qj;r*WmgzqAg2CxakT9T$Xm6FO(}B04`YKeEE!+ zFCX||aUAm*af}i1fg8Qy5r$px!Ln2#)QR|D7l`wL3F3UaVBA&3em+O+`}sJx%eh@o zEc^M=1%Kyu!HwSie4N__A2#mi+mG4_l=0Hl=i;IrPp@Zuvk6D!-0oG`uqF9s;tT!f zb}e<-&*zRM&Uee@HM0YPRsjaQyn6=EY`nCCnJI_)_BcD1yn z!xqaA$j%F8wkvie9M~9m7XLPr=9@UmZJ6aw6Ql_v{0zH63rv^eiwGDt;)ejM{0zHM xJ3(XFUeAV2*vy~LCuR~s8(2|Zzz_E08x*Hv>xbcfC3*k=002ovPDHLkV1m|B)|UVP delta 646 zcmV;10(t$^2f_uAM}GokNkl%=U42EIS;hvn0n|9%;BV_p(1$W~2Sp^4D zFTSxs82UQTa|34hncV@bi|}C@!iQ-HAEqIEn1=9S8p4NZ_Sqf4e8+Kwa_?~*p+#1I zV`FR&Ex8JD{55%aY>}IU4{tIe@w3W}Olq1xnbdS=waK)LCVytss{51=VdTSwIi-#z zulg0?!$o0Atx|JtY|Q->;e!u#Y8XEkLQMGZrml9)=!ENrt#&?VUO}s4Uo5G@*d%-3 zPx#w`>d^DO!52uAqbB0Gxy#h2LnY9qn!I|QkGU8Fa_5M-{r8P=4ju+h9QQ4Akqq?e z%@3s(_!t<%?0<8-m72sPm!8|9^UJH+_s3Xp}wx-tpY7dbskb zKI0pt$?JPRAA!S|bhN6!pU<3O8TQbn5SZLo_H(-=4+DBfF{92$@-V>d{e1CwQiw6> zOQ(209}KhRI&QDQM{c&1L!H_reDGoZ50CCTAMgxDKDbdc>?YnGZerwv8+kpe8qNI) zA3m;hhkpaOPhIVr%TuWH0a)H^b_XVqC&lSMbIQF>PPUsR)2RG|SemK@m@VmM`eEQR zq(!fG2Li!jA9ssh?Z&%3V~4k-kfc^E8ouq`NY=9CjAdz6i%z>i*T{Egq=aeRkxx