From 34a2ed04197278851d0b1ea6490169137c0683e9 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 14 Dec 2014 09:08:17 +0100 Subject: [PATCH] Re #1926: SMLSIZE last line drawn, gtests expanded with LCD character overlapped test --- radio/src/lcd_common.cpp | 2 +- radio/src/tests/dblsize_128x64.png | Bin 513 -> 706 bytes radio/src/tests/dblsize_212x64.png | Bin 558 -> 749 bytes radio/src/tests/lcd.cpp | 28 ++++++++++++++++++++++++++++ radio/src/tests/midsize_128x64.png | Bin 503 -> 694 bytes radio/src/tests/midsize_212x64.png | Bin 532 -> 730 bytes radio/src/tests/smlsize_128x64.png | Bin 527 -> 657 bytes radio/src/tests/smlsize_212x64.png | Bin 560 -> 709 bytes radio/src/tests/stdsize_128x64.png | Bin 483 -> 590 bytes radio/src/tests/stdsize_212x64.png | Bin 507 -> 619 bytes 10 files changed, 29 insertions(+), 1 deletion(-) diff --git a/radio/src/lcd_common.cpp b/radio/src/lcd_common.cpp index ad39b1d06..9d538fb7a 100644 --- a/radio/src/lcd_common.cpp +++ b/radio/src/lcd_common.cpp @@ -113,7 +113,7 @@ void lcdPutPattern(coord_t x, coord_t y, const uint8_t * pattern, uint8_t width, for (int8_t j=-1; j<=height; j++) { bool plot; - if (j < 0 || j == height) { + if (j < 0 || ((j == height) && !(FONTSIZE(flags) == SMLSIZE))) { plot = false; if (height >= 12) continue; if (j<0 && !inv) continue; diff --git a/radio/src/tests/dblsize_128x64.png b/radio/src/tests/dblsize_128x64.png index b18c73888bd5d0058ee6001278a9162b021cba37..925840094377d18a9e3eca725eb5134552b9f1e4 100644 GIT binary patch delta 646 zcmZoA-F!Qh1CgU3CO0`EWk zvwq9FwUU2p?-oToRxh0KsjBQef_3|?uAxr7<0EC+Jr$bb`|jQgKf80&>qW<}-U-;_ z?3v~xr5|@@-Ss;gYTIw^_T98y`|4C*i|V#$HB;kbx|0ewl$Qv*rEU(q_~h-kTWJT9 z&xAcnSYO6=MB?)8E#WtAb1E)zj|jivc;}7j8HSHH`RtVJ4kh~ixRHIE*~R>i)k_-) zDO3MO*2~qVB2#Q;;`*=#0j48wB$Qp!%&XfMEl@xDSc&gjpPS?HC+7pZn~s?86g01P zU%cS>lN7I-H=;$3c@CE@p0c@WaVkb&liY`jx27AE*xHyH7BVDgFi0F$%USiiqB%U9ouef^zbTm#dm(M?3#V}*xq8jtn&97AdD#oNU?62s+~_BEM}15Vt|JM3iFx# X9^Dm29Sbrz8Gyjk)z4*}Q$iB}fJP*W delta 452 zcmX@a+Q>4&y`FK2r;B4q#hkY@4;Hm32(aG0@=yK#vH8yuPBHiCvCQ?G`A*rJGrv0E zNch@P!9M*ervI|62Q(Pm7!9}@0vURk67GFr*`&GjLhz5oTIOQb0~53rmP;HC|J(BY z|GAR)^X}a)`F_{0j%#=6HuLLu%B_EDzPWbuUd-oDd#c&;93M`o=M4R`-0R1uJ?j@g z%DQ#9%UbL32d?T_2HF2NY|OORI{aB%=Iq;Ld*nm^K2yBYGqG&atrpMQCsm%zt>p+_ ze)CG+r%!v5wI3L6wDvr4dpA?o+SfVf-fx&5>=oHAvG=gwq-o^|tS!mvS3E3S4$V4o z()t?@$LRv?OTQtc#|i8DQjw1jqKi++R#vl437T+YYnV%M)V-Cl7bbsutjJlJUha7M zZ2j?zdKz<1wk~-(_b#jLGoLhnzk3gKGYu>rd3ZJSEJihz=fw-XrJZu!V xFWj_)sX&BbF#|#n9AGFywva$X5yK|*ldX*Pp4qK9g9-*9@O1TaS?83{1OUa?%#{ED diff --git a/radio/src/tests/dblsize_212x64.png b/radio/src/tests/dblsize_212x64.png index 81f2271ba0e47deeedf196a51265ea54ec2e1615..fff9e7fc8725f85bd40802e15e346098df1e504f 100644 GIT binary patch delta 690 zcmZ3-@|Jaidp*+xPZ!6KiaBrRL{Dl~5OAHm^3CL}8!!JfNR2$PnssN`uQ~fAjy2rb zdCB2(pW!|Rkv}W78R{Hs6qr9Y@*H6|5|BUP0Os`c?_yfbskmbGhgQk3Is7RabMt#S zQ+d-GU)vl{l0O|@^HqIo`PH2fPgmz`Jooyf?fIix@u}UV^>P01Ecfm$IP&4vS-W?v z|L^y2()*L6^nTJxmFt`Rf;Y{7BYRFocIVXdaX#y&zgb?_9&|S^D?fPIj>WnUJmy{B zbbNZr6QkdOTd#92W^7+&AF|&5i@D(J&y}x>+$y$TdR=39Y_0k$e`DwfFtoJ7T?POJ|57>I0f16?awYsw6UHxnRzIj$6zv`P+Vn*fJ+W|ah&n^wG zQDpI)eq2H|c3swb?Y2dC=g-d%23dFU-Rm^XDU0sr_^K@e%D64QD<78}3N&rz*1M@5 z+d@j$S@$2ll_&hPZr}XtwpS9>jiDh03N{|b_RRfxn6?pSd_)a;`o-wcoIHuuH0Ow;N5X}_bbvUTy6o!gBwEW{og zh&-RMJtQ=3#`)%LUf;s&Q~&iJoG-j?{ad-K#Xlby@Hv0%x%tye@r2>aL>K25=lP94 zm&tF9U^>72Va>J31M`?Fq;odR=TG5L6)+9Yw0zB?rBiBW!tQ>?dglAI$T-~-hBDI& z|5W&PJl}t6-IYe+cfL~VU3SZ~F|A%4`|aDozE5k!3iv)Fl8-hl{h%hMdRDC!MhfeS Qdl-Pg)78&qol`;+0Pze_bN~PV literal 558 zcmeAS@N?(olHy`uVBq!ia0vp^SAf`og9%8!^*$#Bq?n7HJVQ7*IBq}me*oli7I;J! zGca&>f-s}`$7M44FHmW%!VVB4=-=NK3;;?$pL*ZxB?=@Zw^7^7zQ_+6)nQ&Xq zK0{Rzu`>7Tc4 z?bQd~{|>vFI)Cnqz2RC%KW)hT_DcQEp)kXVr++;>l=L(1@0INvw&#oYe$V#FJ-&^* z?@b!>(#Te_uX7}$9RvoZ0^1}pN)jS8n3#%bjq~# z8McdGx%8H6@tzfz`_6b*pzdgcK)~a@&y###6c4b@Jw)Er#g9cbP0l+XkK<`@X4 diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp index 47131b578..9a8e67d74 100644 --- a/radio/src/tests/lcd.cpp +++ b/radio/src/tests/lcd.cpp @@ -210,6 +210,13 @@ TEST(Lcd, Smlsize) lcd_putsAtt(10, 22, "TESTgy,", SMLSIZE|INVERS); lcd_filled_rect(8, 40, 100, 20); lcd_putsAtt(10, 42, "TESTgy,", SMLSIZE); + + bool invert = false; + for(int i=0; i<3; i++) { + lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", SMLSIZE|(invert?INVERS:0)); + invert = !invert; + } + EXPECT_TRUE(checkScreenshot("smlsize")); } @@ -220,6 +227,13 @@ TEST(Lcd, Stdsize) lcd_putsAtt(10, 22, "TEST", INVERS); lcd_filled_rect(8, 40, 100, 20); lcd_putsAtt(10, 42, "TEST", 0); + + bool invert = false; + for(int i=0; i<3; i++) { + lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", (invert?INVERS:0)); + invert = !invert; + } + EXPECT_TRUE(checkScreenshot("stdsize")); } @@ -230,6 +244,13 @@ TEST(Lcd, Midsize) lcd_putsAtt(10, 22, "TEST", MIDSIZE|INVERS); lcd_filled_rect(8, 40, 100, 20); lcd_putsAtt(10, 42, "TEST", MIDSIZE); + + bool invert = false; + for(int i=0; i<3; i++) { + lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", MIDSIZE|(invert?INVERS:0)); + invert = !invert; + } + EXPECT_TRUE(checkScreenshot("midsize")); } @@ -240,6 +261,13 @@ TEST(Lcd, Dblsize) lcd_putsAtt(42, 10, "TST", DBLSIZE|INVERS); lcd_filled_rect(80, 8, 46, 24); lcd_putsAtt(82, 10, "TST", DBLSIZE); + + bool invert = false; + for(int i=0; i<3; i++) { + lcd_putsAtt(10+(4*i), 30+(4*i), "ABC", DBLSIZE|(invert?INVERS:0)); + invert = !invert; + } + EXPECT_TRUE(checkScreenshot("dblsize")); } #endif diff --git a/radio/src/tests/midsize_128x64.png b/radio/src/tests/midsize_128x64.png index 316f7c0f9f7575b533e7111fd60d5aef556c8d8b..213c92c4d01d71160e726e95022fb404808265fc 100644 GIT binary patch delta 634 zcmV-=0)_qe1GWW_M}GoYNklU#3sMazG-z zu+o&$4`efaVzbHxBLb}H`F&)3a4rc45od3GTG`<_Tv?6)WUU?_Tu)02*xW+Z&R^#eQ!4^ST^xZ^<{&`JC!`0RHcc!UQurxuFj zzJO~#zza~xz_Mfj7uxs>L78`qit!$B7Apzs(aG~)|L}xyz{hbMg5CiI08`5WEA!ZA zBVi*6SLWr5RsHMuy7rqi1hCegbc0NBS@FAI z5Uu&h$#VrO)`V&33QWRaW-dwQjmmd_!uKX7uLl$hU+@{leJ})pp#Wg!3!oDKsW5q8 z(3tkMq~O8NK%P^W7V^EjC$N_T1~H_P_9Lbz)QVPvkGWaM=vbY~2?rVE9FtfS%!C^1a~UMQt>IigrRbc= zLkH>B%Zu1M1REq6F^PzLy%%RCx2LANm zoO)&l_Y`5j<+?>CiOcV;<5;E?cVL@{;j9e^Cq#U%W|)8HZ#%h8A(36pYC2*&RZd#|Vm$boak{vr`~8E;9z6_4 z9x*?V`Kx^Jcaw$t|0(7S=fe%o>ptf;zGi44+NfcYXvid>%m5+Ej&&L`9pP{QYO1U5 Wz0maUw7Vb!5O})!xvX;KR51*XQ@TIMC z{_pxQ6t~*U4}Xu0NE##U=fj@a&Y18`&bZ)6?O#p|>9UnX_3TgbCTCo5bSTdPVj&at ze2x55XSY*YI^M}M*vZ&L}Mwq{uF5M`IbA4*ZK zPryAh)k4USMZp0xS9?Br9V`q7xv30QSHo9WX%}%*8L~L-!VKYqnepN4du|I}Xk@|R zl6%G|I8aqu)xza9+=?YtFhjusGlUOj2p`N4KA0hVFr&`%F*DbW8G}Cbd@$3wjD9#e z+81hFMt^^xEs@gJ$G3db2HvK%=hN;0YPnZPUhsY9!Md2-6ZdcsGGtM3z|6>H^zngF zcRwy1zhUrtzU)RG;fO3wyD&reU}k*y%P1O zTt~qHGlUOj2p`N4KA0hVFvAlIV1}L#W(Xh55Ewp~`3K3@sbYFdTJ-<`002ovPDHLk FV1o6;RA&GH delta 471 zcmcb`I)!C|dp+ZJPZ!6KiaBrZ#`ZNUNU#RXIb*lmtjvmEt#{?3keT-BE8($3@JVw{b@CW}lP0mj0i*_WPmB?R8u|V3 z{Lk?2b;XltzsJu6^XBpG^Lfuxx97D*&Fqy`nR7O4)bBZ(I$h$Sa{V)(AJ>HKEFSJ< zb=O>aE$iSxfyoypB%O2b`5>rVbA&_Q@DLhv^Y@(ZlXtV*Jl(ypxtDdV&z5a{->%E7 zt=>7i`Galp#Z^6TRxXUmZ@IaC^AojWA?x1?8<|BG2o#q-i5BlVfB9f(>&2t`kABDS z-cMT;S;o!lAdtaIMU;h#ArQW&mfr8tQ4ne!5 zmVTh4msQR`KX+%{JBc~TPn4fMG5ht9XN&oj-M#->KX>j}SNiw?=1z4v~)>`DDlx9_ambK#9ALAC}c1FfCo@3Q=0>F#sti{kTtRORV^ wFDc#EU~TcUf_L3!6pN49iwOX&ggE6NLwdl4rnw9FxEX-J)78&qol`;+08DQ1zyJUM diff --git a/radio/src/tests/smlsize_128x64.png b/radio/src/tests/smlsize_128x64.png index 456ef0e94e6550030dcf18f497aa0eaca1654e79..47b9f207a5cff2bb358bc363642c8ef10457d16a 100644 GIT binary patch delta 597 zcmeBYnaDc9y`IU$)5S5QV$R#yfkMp+JT900-k-d=C(~YHrb%N*(r(f3wVm5m=x|Ot z;2btB)l>83qK+rVzjlZm@6^5?uKsN1{SAAbZ&FgyTw1f{_M;=$u1}pF{e01WD{cQ^ zKh2k7oVyaE1h3Y+-_pLG_Re%K>mHw*`}gOIL{_ih*}lUvV=m9U`VX%nxGzk3_x`rh zd>x}7_cOe+0&8NwMwoBWJlC?dVU;_d&VmQIOZT7r(!0f9yOb^V;j2AQidoF2N6X#h znfFQ4^J?}{)A03GtGizBQM$(Ti_`5i^SeWTQXlE%Tj(9wIYsPyoxWb&+zf%Xg6%&K z#z#2(c^Uck)8z<;IEMFsdwJ^WC(Q5MU+j44`&EDOFV;RPS(_Yx7@nOSGo`-7aeEU} z!$O7x4F(A=hBl^#&S#AFGv0hqu1Hq8#`W8q_NR+c8KwhEp2D^WvuvS-^jhHeqE5E zdZzqL4JoTjZg#D&#qV&sv$idMSfIuOv=Yg7BxWYtV+ozt=_+%axfw1?_r>ko+&`~u zTOy;~@`xhMm$QGrcz^igl$1R|f4%=ct9-{C8|J@-6%K_Wx6RbDGon z+r{&~#;SgnJA_vh%m0-rGq^O?hZG%k=-A-z7I#Z}!_z|Iv~~ z*@bbbi2S>N={>W!QV!b$HXOJ6x3<|TLv-cb$HtsiHSOu~^;W9&D`I*6L?tP|zW=>6 zr^VBIJb+O{rb z24{0jG;@uzT}xg0veKU1f>){cPna?;yjoY{b7E5Rx3~Wozwc))?aQjaxlnYqcP{(< zoE39)4l#n9l<|FvmxPMF*4|*j8s1ulzNH-xr*Dv8>2PeoBrNarByY}{GxM#Ck;9o6 zWnc8~E>=J9XSCq0W|Y2aN$epXi6?d5ld8XX@3=q3|IXt0gMVFTfOyx0pUM3#;)|Z- zJ@?nX3FS`?`b_aNdLYaA>+}a_9~{0fu!-f7RA6IF5>R-?{_&Ws)9J%61Q>w8)78&q Iol`;+0L3}Tt^fc4 diff --git a/radio/src/tests/smlsize_212x64.png b/radio/src/tests/smlsize_212x64.png index aa8f7cb624520ecf4d4d565c3386bd34f5a85960..465d4fe5fd013cddc300cee298f15bfcc5c1b783 100644 GIT binary patch delta 650 zcmdnMa+Gy~dp%Qzr;B4q#hkZyqbD^P2(&)T*m-_U@7#0Du3BXt>`mt;KKVb-CH;a{ zzpS2YMa$VuI)=w;3|ltXO}6*zzW!7DeEiV~^ImVCz3*|Vuv3TOy8h2HH3pSGPhE~) z-~Dv8#QDoQ$0a_SSUgqFa|+wOE+sW~cBQ`7{R44nJO8{p?a;Ee-l+9-rZIn(ztwz! z@2T4HdQ?I+4S`O6VWYdz3+GTf1WVYwdY{izPq{x%Ri~6_S(oz|I_=a&}QxB zpOO#u#XYReKfEXAHj}Y6*F)RB-O5|{Kf4=#I_uSX;qOV>_Y2R>b387P`L8v|y!qdU z+AyzZ%WJ>8cj)K0J2yS9|NNuA^VDdH z{o7xcSk0Vv{_ah;5XU*MvrZn5NxyM-u4m@FC3=TmXYHKSUv$c~QnBSg*n>M6E1P)I zEfk!8;6%Z>IuDNgFPyXJjq}syGZ&|=dTRY$ebK&iYXX0svios`U21=2z0#Ql_4|A8 z?T@;7{Jnq6$1na0TwhloUB0N|>*d6Zzt%GM_t^`!mFMxbKl$e(5xTYa-=nMP{P*T( z^!z%`ztUg1#-i!N*M|zmDID@R(GC}>lohbB`pL`{dwa9*(Jed-K;Y@>=dzC3DWM4f Dztcu` delta 499 zcmX@gx`Abadp+Z2PZ!6KiaBrZI_5PS2(Sh$e`RYaZT^<&>L#8>7WKcPmHD9)v^V~c zbv6pldwSjG{AH7^?MtUT_4!?F+v2!gwb(Q+cf+;kyIBn$t+t-GY~|X5+^4r=cIvFy zf9aavjqC0C^PZb!-HnUURSghLagpB_rd$2`kFNS_y*+W4!vb#9f4M8Wz53m`ZM*mV z%ziKXdgk?beeoh;!Ju#3Vk@*CD!cvY5VT8b>6gI8T=xEX_FqTy6>aPMw~6n&)RJr) z9kNaBPM0B{T-k=V>z+4f)z@72yuY@^`TX6_Tb-R_-|`>YL3|43i`V2yYR~O^WQA^wD$Ld zZ264qhPQz3d4BuF-uXElj?dXUy1ok=KKsMm4y0b}l;nG_{;2icwu|rYoZoxF^woU( wCB=MN_e~ES{Qtx`4R=`lSL&6R3Js{AjCZ(YofOVA9Af|iPgg&ebxsLQ0GtN=v;Y7A diff --git a/radio/src/tests/stdsize_128x64.png b/radio/src/tests/stdsize_128x64.png index f2ef3b6f313889ce3967f7d080c0a77f9ae35e2b..c07424c5f2df1f4900c1cf93025c2f11575bd477 100644 GIT binary patch delta 529 zcmaFNe2!&;NBu`n7srr_Id5kNPHI*Va5=vA&gIROm;ZXSDj9n?Oi0^sf4X8q3!g5} zhLh&U3*Y=+7v!R%vZ}u@Nq1&-oAfH1*B`m2_GhoilCJ-~&u`kQL-&IB-TwPGd_$$! zC7rv97cE}H{9OIQQ$ zyxsqCwtdX%DJk<|r=G5T>2J#Nf;+CE=7#grk9ihi-^HHP_O!fb zR9&&o;P##+t!JxQ_dLGWw8xpT{y+eOfd~T+E5l^zwlbNd;x(nm`YRpMW=RF9?4GCk z@446ZPtFY&78EMqvenF5s}aH6L~{{46juU9qT{wXo%~ z(`43@>ABOyN@m8GO!?fvXduJewvYp2g)<}EHVAY1#(D*}(o>n8Y8%)aRthUrPVkV; zKP6+PG;NXV&yUYv%y&-bPU^mXX^YCvdubm(Zduo{QskDOuB=W6^EI)ka#x>8i(^Q|oVT|F`Lmb*15i2L}GL?tQ-M=IT^; z=z>blx0TnTyb6`muCd*{UMFClvv$GSj=#_Up7^P6_&WU?gVw%l+A^iQ%invmYzUJ% zuw!>Hb^jb0Ev1qi9sB_d@-MUI^&FD z+aj@sw_M`uuHSxM6ZiXnw-%9VkFZpuXbm^228ZBb?nOFQ+)2*%WM5^z$ z=9X7y_8pna@GZ1VSED-Ueu^XaBTjYYt4(L#)Sh0-dbezwcGG{x`i5N1Bp=rf!Fs4W zkX;~qj@59rv7Yhl1ELCM;toH)rP#mNCnwvQmJxVw?a}ys?(%Z27aobZ98F(3O{KEm zPJg%3Gq()u&0<>=isoCU-vAJ zV>Rjiy(Rbdu64_fT0WOP+n<=c_KewIwzEb%CQrBj@bIFkyVak!zl)33YJD`joBr(H zf3}ZCJ9_8e5)I*0sQkY9$ny=KK9zqsbA4OVp8OeCv~NnuUpGD#Uth5@Jt$8}?!EJL z*@iHynqxPwM?Z}1`=1jv>2yNY%MUY8W%K{y%Mr z$iSO>9X6fU-}i}ISW>@vXOECw|G)juSG;>J&3kh8b%Aud;!yGUC%mP*o8!JbJk9@f zW~#=fa--UtPva`$ei_Ge7IVqeue~prE5;`mvP^&X4DpA}JTT<5ZuQb+ajEZDI%;1& zKh0zRLu~ro_BSuskM-$4{G7orSwpGLJ^_nCON`V;SoY|i+) zQ^G%;7xJY}w~pLm8B%ul|7MXXu_h*_l z%{n}j->CGV_r5*X_5_)KZi-e2`NDAV>wW(g^%pT^p3C(*vK6qoStvOFz(5*cp~KOu6hM}>fYJWF&dxn5 ScZ*XPfWXt$&t;ucLK6UzNVHzGnpwNatjvmEjm5i_$<(~?T&2`(#g7lW z_j6ozuQWaX*~Is%mu70@8o71i52qX#x-4|z*Za4p{?$9}pTC)XMQ>o;?A2E%#GX(3 zXy|3VFE`Om_i$QGJrd(voIbN5m`xYL)ubw5xI`v?3c(-xc@God>mN3Wa^ZP-rJ>k#*`N_<4ZhOh2?COOKK;Y@> K=d#Wzp$P!bv)~~B