From 64b658371e2b01737a2c22778ae339007c3bc17d Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sat, 17 Jul 2021 18:24:05 +1000 Subject: [PATCH 1/3] Make default colour first entry For functions/cases where the default colour is not specified --- radio/src/gui/colorlcd/colors.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/colors.h b/radio/src/gui/colorlcd/colors.h index 93c83152c..a670fde42 100644 --- a/radio/src/gui/colorlcd/colors.h +++ b/radio/src/gui/colorlcd/colors.h @@ -27,6 +27,9 @@ // TODO common code, not in target enum LcdColorIndex { + // this one first for when colour is not set + DEFAULT_COLOR_INDEX, + ALARM_COLOR_INDEX, BARGRAPH1_COLOR_INDEX, BARGRAPH2_COLOR_INDEX, @@ -38,7 +41,6 @@ enum LcdColorIndex CURVE_CURSOR_COLOR_INDEX, CUSTOM_COLOR_INDEX, DEFAULT_BGCOLOR_INDEX, - DEFAULT_COLOR_INDEX, DISABLE_COLOR_INDEX, EDIT_MARKER_COLOR_INDEX, FIELD_BGCOLOR_INDEX, From 82461505fdacb26feaea83b1f5d4323bdc1a0a37 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sun, 18 Jul 2021 13:11:37 +1000 Subject: [PATCH 2/3] Replace image to resolve test error --- radio/src/tests/transparency_EN_480x272.png | Bin 8989 -> 9025 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/radio/src/tests/transparency_EN_480x272.png b/radio/src/tests/transparency_EN_480x272.png index a1cc5987bb553b3e4b43a3a3ca9b8fd0e5fe2023..301584068b0c709c06228a5dc6c14ba7d5fd8ddf 100644 GIT binary patch delta 1100 zcmbR1cF=8tGLtgLM%8PghJF^C6HHQtB$-&%I2R|HN--@~WZ+?x61(t&d(FiQ^1O`~ z1tdVk0ePmy$rl!Drc6E{Vm7&3ihuGn1;NQvh2<3@+>#4Fv>)hHS9c3B@m+9W`{LaK z?!{jUxEe1SzPR|sX7WU!25D*j$##m4n(tI(o_T&gCfTU?{IGm^-GsN#i)9Z9A|4s7vfiMw85B9R;n)2~s?hXNUx80CoB5TR1;BD%{7&Iafaa#P)B;XN!yM zs4NkGlu;%TqiA4t#Bi39`{Z~fv&kpqlqYkE^Gr5YP}k@7bvoee+LTjl8FAwNL5%~> z`^s4&PVDFYcxP&xc;V#W*z#v?i;T#U3_i9` z^W$#i@VT7I*GsWqGI30DTYvg=>jd%(A>bq*sE-P;u}BvPiYBBiwcbk zK8^SIm7d)Ht1%(aVAe18N{AH~fmWCUgN=W3tCFp`hjYWCxh;ZxT#E&*rI-$@v9P?G zP;aiFx?4aJ=-$>J&F&3vKKwsm(3rCq7^p8Nzj2Sgu$cADWO)hm$rTC#`VCv=wit8C zxHXrXu(&xhcysKjaID*~A)rX|5&NdMe+!#x)cfB#E%DcrkbNYfn>#s9$s8$olyq3i zgziNM7)s4stY{#`w1u}(|H*r{lpl@<^<3K6Q+{Wch%40^9ep8iJmaA;l6RH#brv6V zoiCta;HhwX5vPd7$K!M5Q(pi3*jCeRsj)LX-z2cF?LY=cgL6VjN3w}x&*X!0TF^LA zhDNHgcDWE=;}@rsdPn5T{U*FUET11YVQqLr`=5rV624OxFTH`O-;x<<+~fc$8SQ4E zf4}GOeqI7hIF60{C-1jv9B}#<+abdv^5Ut4Znm3q!jF~%8QfJSrjrlIX#?%HnS4`0 zMWe}>MdM~`#p83lo1DKLp3R@~`soA3dTqtyFZ7OFykl^}3G86cKB$AGCv!{N8aV

wzF+BZ|Hab+?wb|A2}tBR_AdjaK2Xx| zR|jc|YYXMzND-Ovc0NCk@QG``AG4?){E=WH+SkT#O#l>~z7mrUh`CKZFX<}U)5c)J z()JAKg%{H2AbDXQC@;89j**g|d|z5ga&F6F&temn6#`7mTY-uAQ(HMl&$b2b!9RdW zsnx3C1*u~j!a&Js+V3WSgi)O3p(7+v6CB;Ynil`PdTk|o4I)`4%4L@sOnX7o`;oDc4#omXn<5#xq+IozF|sSQp)K3_1wZ#39NLntPv6lF7@I%6NGBjkXO zqhOj8f^iZBj3QMNEx%iH%^G02Qm{zQj!uj3zH9jyJ;Gy>vg_03w}R^+KR^Ywxbaj&jF>Tt-J1GpdtMrFp{|m zQFIDyDe?ToGd$l~7G4&l4j{-{;G;t-^&~2-ntt59LD@T28)9LdyY4%B676Y8RGc;U zr_Ju_Jw*z>L0g}7wrvkrG)aF?8h!erv9nFn54T;Cwx07k$2t_d(?sBj80GoKL-t>w zx!`3|^16=aW(Yr1TO{Mqgigkx3`q8GrC21Sla0WSHp?=9bCNA>uNdZEim(@JjL`Ge z)8V)Xb|JVVbppGJ)Tz#DB0f$Ja~Y4L3=7=JdD#oy8g!_z{Bo0w+JF z2^t=EVs;ngTiOZGz{@H-(o8Jf`hcoawzpchsxRP0EA{FX>`}Mzn8WX384=s@Svt7} zgvC`r0O=1AYVGBrbfH8z`e7^Oj#YaF;?=BL$92bkLVa=HEvj*BK`LY)>k32Ct_j&5 z=}O(zF8WXIXVO;#m3?4V?gSc) zBw?hPbqhez>1@@5hay4h^!)Qb5cSdp)AvtAaDGe=DCreRi0>wD^Bd#gEFU!Ue9*vG zz675WIUuYOf_F0rcrPjOhN_*0`8O?&P&3g~F$@CEbvWXLH*+WL;NG6JE5MXEQy$N1 z9!;=>Y-m`MZwa1_--U8$D^CCT-X3>y#1czraPX7?w_7{@`WMp|HlV@|f=^|+36L7t w&QKQk4sXS Date: Sun, 18 Jul 2021 13:42:47 +1000 Subject: [PATCH 3/3] Replace image to resolve test error (CN) --- radio/src/tests/transparency_CN_480x272.png | Bin 9206 -> 9228 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/radio/src/tests/transparency_CN_480x272.png b/radio/src/tests/transparency_CN_480x272.png index 92083a206f956f9e805ec8a2c652f29351f35f5a..a6ee82449dfaf6e0943823681abd701adf67dcd9 100644 GIT binary patch delta 1042 zcmez7-s3Srh4J!6)#YM_a|_ZAW}H$nV&U=;ayy)5!s6!4Ai-p!v*4q6#NvhaQcQ~# z4M0SLJ&W7%1@6HoCMzgJPCh5jJNc)CfRcxEL#jy{TRq2|ilQVJ*UKziHP*Yh3r*bl zmkUVbI`%JnKG|PE3#wdyvZkz(<_o_=iSy#}<_Jm@+5IVe&VDoRUt#;7*y*BzVvCm^ z&*0!$B_JXDNWyo*R_<3tA7n5ICOE zB{SJjPHS?XsO4lXDRuo;HN^)Dl^nP2l+k(eK0)Mx;(co-ohSEOD;}TY-K2Xh;G%?Y zE6_8hEN<-NLE2BR=beg-uYR*0i-^mK`<^Ep9lM?-DAcPzY&Vxb!FODm zXYpFv0UTi@c0DZroV?B|FOBT@yT(S1TXmB%<;3_ zo-0M9XW2hTIi|(BFD|NBP5!88HrYWsT5|&@W25zx`@9|}^<3D*K9wu}dmyM_{m0(G zMjegSjvR%MF<#5%>(P*!rQ3-Q5O6eDg7zwl&C+t0W&~m>mH|xwFh-&E&}+<;^DV77tLr z>uE8|q&<{_BSmDw+xh%F!Y8i%e$1kJ@JE7)XkQz{HE@1W>w)GMnaPyhmA0 Ymmj)#YM_ZzBqmOj3m;nM4J}7AKlYF)dbP;9-;!yYPd1&BY7yyp0zH zBtXOgd8Wn57Zz)#OiolZn_ME|ptwZwfRU7Ovpox6Ooid0MV)_Qr!U?u;9mTtfUEJM z*q4l|$pzBtlcy^NOs){&(dM}%AaU2z;>_e_jb|==Uchjgf0JzO<8!>5zGkh+=n)H9 ztZ1;pDPaq%?JR}KYn4(aXGkecJ}1wiC}hJdY$3z*gN zR~DGCY-l_1Lg0ADA&JQkgv}<)$pz^wewliqwc&v5r}u12QpA;*xqt2!sQ@2gG^~>bHVr7#z$O);Js6Wi8l8jUQ@QC&2zr=-4jE?Z9-2VNT z<)@$A-Byb|#veeIFxpN&FP%KOLRwGm181ZDllN>XKO7J0xwNsTv_E{IcjVz*M)&9o zi&@`HUMtzEKVjSC0=LG)86W!E4rFj7v>j*>7kT6K=R@-!g{2Pq#~EI(U9m#K*U1Iq zfuPCvh0THP=bzlJC?9YjgS*Ovw+EyVNEmQ5UR3P6m|_EpO#>;WW)l{UH!6EJDkPb_ za&t~FVabqUQnw2z5?2Cx)v_*NL-RzTy&^5oJZ`sI+-j23t#O;YPRVTY4&gv8oy7-T z=L@Xp*s$QhBH@(Rq6rHVmP<0TR$00QUjy02uvF2&>WJa2Hkg(m9c#{ZhpL4s;*WZ* z%};!L*lzyh{?y|Ko&SY7^<9kZSiJN`21kQ)LPjlf9QCS@>rhmySh3%^5& z^WscGOn|z0**=vk8U<{aJfX3*X>H4t7fT=T9lMy64s^R96DTfTW&smow{~G0gX(Sp z`wou@vYYHHSWfhd@_l+A2n^x9{N z=EE$TzW%dt>@1g?u>L1At2JkR&pRiXvu!sZj!XqPvO}s|sBhVHM{y?SBJoE+hhCiH z(hNy}VXy=!4>Fc#wSdHm*bW(yH!4pg_5wx3A3-8xiQ!~^kq%j47MK<1=FA|)H06yG zM1|}{1s1n<3%AKvfytm-Y_Xz4tH26iRP!FcD6pW4qld4sM{U()J|(xw#}pNTc}Z^a bC1o{{He2uAa~I4JW&i?DS3j3^P6