From efc851f5ee83f3d67d58ba672949111a28478f59 Mon Sep 17 00:00:00 2001 From: Rory Hayes Date: Thu, 19 Jul 2018 21:39:12 -0700 Subject: [PATCH] add battery icon to powerbutton menu --- components/smsplus-esp32/component.mk | 2 +- components/smsplus-esp32/graphics.xcf | Bin 62379 -> 61749 bytes components/smsplus-esp32/menu.c | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/components/smsplus-esp32/component.mk b/components/smsplus-esp32/component.mk index 5be9a88..f95ffed 100644 --- a/components/smsplus-esp32/component.mk +++ b/components/smsplus-esp32/component.mk @@ -19,5 +19,5 @@ COMPONENTS_EXTRA_CLEAN := graphics.inc graphics.rgba menu.o: graphics.inc graphics.inc: $(COMPONENT_PATH)/graphics.xcf - convert $^ -background none -layers flatten -crop 80x316+0+0 graphics.rgba + convert $^ -background none -layers flatten -crop 80x324+0+0 graphics.rgba cat graphics.rgba | xxd -i > graphics.inc diff --git a/components/smsplus-esp32/graphics.xcf b/components/smsplus-esp32/graphics.xcf index 00848e0492d1126b4b19b653eaba414a7de50686..3cab8ad832b638a48810b84169bc7b1b2d11cee8 100644 GIT binary patch literal 61749 zcmeHQ31AdO)~@bJARJ;~U3FcL;m}1zMa5mjD?Q43afzZXq6Q%xioh?p9_wzRoN~)0 zBCF9=R}dBPR>TO1fT$q%ArixVh5*TAl9~R$_g+VT&=9X!4ua7EJUPvhY$)3&u8=f6-8;;d(D7sO1rC zvup_cFmbO@&FIZ>{_S+lE*qEatjZiDK{UF+?v12a*zM1kNGwMB+AliFW zJK*Vp(~*A~V`+P1O+)#oGq2E}5h&+OO+)3MDdljzO*r3Tc?8=@I2UCa8Xrr$3_azG z{L*&QEAUe4(Kx!ee5K>&C9nkd~7?mmv1|@A^&BpP|GjJQVbGk;^@=>d%k=Y2|DFh%hD|9S z?ETV>=1wc=;CV*3kI*L7j)3K{;q|rozW|hBQXIb_pJe za+*LWl85l=S{}luO%a;G8R+-0&^(f-A`NmR|8KdFjdfx>{XxSdD5sl;?IfI`d>S9y zPDPC0_*k4TSZEAxhjIj4j*sn1xS67l&9fUL-K=o2j ziL3y&odG$JVFdBo&chhn7wB=AgEE^jz3n`NcAc;B1E4vN``2>*oMGmO?c`*_4lh74 zC}#lZn=U3C;(lyI5c$3Hj2*C@d&9svly5l?GvRwv_-~-X&2EOOyvs> zIg^l|LDfQ@AkOvjEyu@pB^(AP$(#%NFhP`)8^Ba%n6g3RW2sB>gY|}-H5sshGl<@H zR_6KkaM?!Be>qEX4Yr*HeSJLVD$o-v>Y5#f{bX!A@1)EHp*WCdV|+M9^(hU3j2O=W1;T{ zH;wWA;5L*aW65?ZVky(&d{h3WJlL!0Qg41^*jvVy^A%*MujN?-nZq}0+1mMiK{AIm z&3v@Q;MtI;elNOUIq#tSMj3={XXZBOLF;D*c+ZGZzU2^ZN)R-JFVHkImtZcJQ$EVc zLBA{!n%R)^(kX)HgFb^GXmB}_K@jCEhYT46fmd&Yuhi{YPgv)Z4livbG@Bs*C07v^ z{ajQi`J}@jZc5pjMzHAF;3c3pG(NUjwjfP2T@KL*78-*$dij>)W4jV=kw*myjbPi^ zKr%O>eA`)<2mBD>kOOr`G6*6+fFsC=WZ)l^6To&QtlP!;x-CgK9pxArAKQ_N*wjV& zf`!K5W4wGT;$yoK4lDWyjbNcMn93Jyu?&^-rCwGQ${~8e!F(Et4&@6L8iPp&L*rwqD@fBMAdg_7F__9XG(MKPf;47c5RI7^LEOvB zm$n-kKVRw%2jmeP%om*-8q&X^sfaTaeL|4|O+DWodE^?c+_wPhtm%RuM1Ip;!dB$3xrnPX2-`_GClmR(ln#~xeCQa# z57+j`YIZw=A@e{V|K&x{Yk3~X1146;b03wd`{LdMsEe`au(_roeFpKxoG&zj(HG#o zM3-~lYQ!+QoCjuju}$PJkVj%3$d+N|uNCFCwuFr$iOA&yL6!$SQGuO_58?}W;|GthtXep zKOqTcL*}#k60a5UF~(|t%*}Es^T9E|nugYEXD*Ta`w2JII1O=TJHl4ve#m^f$p`-3 zP))M{<2gfU9?V2sohkW$fu0+IiQ4$Lre==I+%a?c;Z7zWpQLj}6TCagF`?J}xld$18un6E^dmu$k}Ua{c)}cB4Pv$A-zneBcj7hkefTba zzK_7%zf6}i67rb&J}TGDYb!Fkuffpacpr~z=Fj)>?fm&Z0rY0RPlOC+z7sa{ov@kj z6DIrfef$!CzK;*g_pyQb{uuhp%=aK34Vle+_c6w53xB?kyvm>NBNq7ceFXB&I2?hw zX6E|{$Z6&~VKd)HboJ-^$fo{$9|=91`9Au1Gp}Xtm^t`ZV7`xqY-YZX3;XkZd|S9yP7se#%DIgT;>|dXc{9$#-2-*`*mi>W#sH0v zZ6}C_=bE-yj*smm?6)`Me3Pp(65K}H+0s-wH8kD^nU9@8KX{SvG!Eonm`Oi`{z}fb zs2t}y#DlB=J@?Z`Z42hy_au01y>n*^hKs$ z&hEa-X`6}SQCA^&FWE@gVr=B0e38?3h+gF9a=dn-{EW{sh}U*duQ%pNKY5gme8}lx z$gk-`5nMDfC*fnfeBN~MX#9NMfG}f&HZ088NWz%49*vLfNCj+UrhFr35{8@}jgM`T z*`xQ{5@H$tkcS*4a$b`m_}7h>|BsTZDAUX znZ~(-^X?Z|Hr7qWjrb&Rt$H9C%as%2`q|5PfFrTp}GiW@S zgZO4I-=Yl*kER0lbclRUZ$W(hMw4$vd~7G-t5E)>86>n7@v)tRFV6ML@iBDh<@4r? zCr|T$JQc8RODK{VXjc&5@8$D?$7{QvZ_`3Zk71z!KR&^HJJK~kFA;HavCHqt{?(3VGPz<9XXbH>5otSV^B)cUCyz?p!I@=ZV%#0YeBz66Md#?KE1 zXF?O!brFrhRHoqn#h@*fcG?tuQjjV}Y-yC|+?=QAEE+y`5*~?`r*ppL_}EUu19N;D zAKOk4w?jEYG8I027E5D3ujS$60(JS=c7nKCfX2tR6U0|$n6_AskL@Jvw>RXxm#ds} zNHny4c2jI+X`F|;{y2kv$hH<{CqA;>)iYBt(cec9G*nJb4q@AQ8_VuN8qdVG#8Aox z&2*G0*mj=Z=Hq8PddvBHreDqz3rzWZHq4QF`TUq;y-th8m=l!b;J^CV3Ii{SC`zj|pQ|K3f_wJ2^Er+m? zhp@_w*{urjm87&`k^dtFv9?8%I z@+Cr&@gOvUgZX?`${Rl$QNE^eDq@k%;(Q|~(HKm!85$pp%t4wl+!onB?4CzIM4ksT z1X~y<1H*)^NGJ#LY$R+)Qa37RWUk;EnMNm8qz>wpGVMscTpu5cZ8o9DHWK>9lykxo zQ@$NJ5xi2b#n{M0`9ZAP#WcDtN%(ls8yX+WR+gcs{Hz?3U$(Ub3r&B{w z75R0pat07N+I~zL#^lX{>*km~lD3;Zt?A|4k?PoH6M8FBEz>V2Wq~PQwo#>Ci?>vb zJSob^DKsL#&qW@^KagGZWNHGB9``s z=$w_;_8{)+fN6!z(4gazbC76|E#Xz`+DLA>XlcwZbw(rnY8EK zox5k9)%~8HkQ-&t|Bd_gf1p=ZxL==MJ-eP>vvIfXUHbIub5FQ2f1Pzt_d7a=o1Wd2 zKZgM4>Px4C^^QZZn(N_j2gG`RzrLNj^z7X|e6FbrnGYN)Q|Fy^Z||P{!##U<>5t1{NYZeE?TVArB9#({-D$!p`^AOlz)VbvQ7WsgFuwSY!~14 z3160je?g0sf<%0@NlKVL4Ui0mQ}b}m01gLmtpKhaz()n}(ZE!n`BVomb(|W&jR?E0 zo4|KNjY)27)i6B|IbeL6LwEc!?MHddhe4k&BE5l>mwdhX=eQ2tHs6DU@-IXXaN)^F zXCqyT)JCZmt&s+S7X$br7?q1AQ5o6k6;euu$_}O<`#Q9Dlxrm=*R7@E(2U8a-{ts? zuZBn={cXG1-@>ekNY9SvZH<+w+l^sYJ z+>MbI&?v`;W?5H8O3`dTPh+wgX-H%#j%wGrADQ}Aogc`$hpzw3%!}0wGX1;er5`m& zJ{K?4z%(9ey!fl+yo-0!?^JZoZMj$$-dWd?vc5Pc(lj5p+^;8wAU5 zl@yg)+fu1uus~e~TT{JyHDDT|;I3||gsVwXkR8|AHf2+plO~}|)Lt8@Vy%rxtUVA5 z72A6t)@X>eM@kqSSEENmEVo?k*`q?EAy)7T#6mk#!C*m*ve63E5Q}Ec9*8v>V(rl+ z5X+6D5Xy#FC=6we9*r_dDM%G-ZG_>M2G7J7i9n~28v?JNSOU~8dA2$l%`kcL?IO>= zE_pt`@cHFSJt68Y<1T10SNpk+ViNS<9>upZH~(`PdXGP*)fmN>y^3JtS4gKIotb?7 zvi(YBKusCAo&g7(aX!-JNY^6`Kzbc%F48ij0;K&YBSdBV*iN#IY6`P&=~ zIuCU%9b^4yjITPJU^YW#p3^?$wg1$K2hA+ufSDzX&-XF4rk`kZR==@rs}8LZ0{-lb zEQ$1Q56@Kao`3`;DT+~PY2n~o)(ic!?(ctAFXLRG2J6(ucXz($u6z528(b{l(u)z2 z_YU{#`C!&1of@2b-g(WNcWQ8{DC^>L=-QV13OpVf=P{La1m_w3xOXXk$52RQ8S)wy@~d$FPkH^}OJ*1cTd9i97S zoz=DHJy~7)_w3U<+^hdR;H$W#@zx2I0j);vytiNfp4}b@_sZ(lA3yKtbN^X)_vxAy z?)pIQ&Ug3hqO*7f;)&LyCuG9{h6RKE%;$2x7lBuxLdSSGbS0qG2+7D(41bws)o=|QAnNRyGK zQ5o4*YpfAMss;t+h^K8tu+{Kg3sKF1{kxG1bGiF~8?|F@G({6sM>Y}cjc;W;TDCPF z+fnYucf>-PBGq-{M}Z>l?%x-3%l7Se_a3y}#KA(Jpd5woN_Fe0y>9vTIOw;RyCtw6 zZoDKww8nM6tcijwcVFRt7p1vw32Mi`L=*z7=9X{RyL(kl*ziI(wkaOp6vI`&AWc)W zeti+qSg39P{v8me(3dFg#^T6{$I!y{)nMZHxkW2hz(%{Vo#k%%&RBIfmJg7>vmQrq z)+!VOA)%H4JmtSqT6yi z7GHj?XE;*b@+=rCny-5bi#Lar3U4mnyM1rMP3+y?+?W?oeVU?XGu4*zZM2x*R=#C- zygXJG-~CE}YVobt2-W8O2e+lCZ#%eubF^rCtL;T48v;}X%NDL7GqUGzJL22_{O9fQ z9VLlqPjzQBQ4*jkS+?*1*Lcjf;{EygD6qsWIZ2(2e}yVuT~&uoqx*NX+Oa>%l9j{~WpkR$DNDp` zw|qr3x-u0erSRo7#l>r0Rq_qD|+hiLdlDT$qJl|qI1&bE$C9x`MrgEA2Q zF8ldoUqAfzxsGp*eu1lFy4?fAP-UWJ*YNvo5#ICynNNHICi>6`bT`U}H!eSkT@1tM{ zQrtudmbZ!0{i$v&x@+&=qRq5o`HdSd-dn_%%XZ*$IV@UfblbsrJhp_c*TxdCmK)z! z9Jdvgya$j#k=R>8_e&+Nbhm<_s2p|RVi^)uvlEMBLy%ZgSksM1iw-hHi7q0EqHs+u zTAVULF$jvdjx?_bUI=d`n@vkkTr7hW@v@C&FoY#rOX6|57bW5_X$dM^TqdMZ2%Xro zCB-c-*}Dttai8#LH@@Wn8ebDSLZz%PQwSnfRR=dP@~X7yR%!F+JT@^Aia%``a^t0o zFTiR{Iqz<@_a^eLq>)_PO-#qmS9zmXw(}&9$M+aG-qHM*xnlisR zD8E=4P0$RBm&S>*jMkX(4|d1x!ubB3hH~pipxj$tvY#ewBEB8f_T+VDY-g-!>n$1f zyVbpEmWVDR;si}J5Erk;?2V()@|}rYH`eyaN;VQ%G*KpH7K7}|#X@#NfNWz4$odrR zFSaq?%WB+H>=NbH^+Xvf+U(a$(>$>(N;bou<^F}+6pI&wZo${FuWdK>;jZ$c-MfSK z01O{(L-DhA9@N@e^*QK&vwr7(&|kfIS1ggJK;Jx{=$DZ7gU(9ko&$Py_e(F)*HyE3 z+Pf07BECssnbdT!Tt2I)h>eT=I5rwn)PbS{TU-~Wn7;ATEnDomu)6e30c@hEJOv=J zrO1YTE;_gc;a&=Y!F^~@EFQx*{dD7dQ(g2i@PT*6^+gEOuR3JNiyRmDyH` z%08kiw~ER>xB?TyE=qiG1*yDz=`0%k^i2voxN8;-ar#bC?)&zvG8)AA#>L(FD~Hfn zrEmP)0oOuflD<<^`O3n?UXcHVzHxPbars^vQuK|ViPE*pXvENWii#EOeCy21XW2z@ zd~>J#*un09TK?e=mTO(_+<0}HE5m1>jeC;6touma(4LBsG948Cmdy<7)_;B9{lfFk z{XK5Gi@rMb4&!tE4bBZMp}Ak!P55p&3_u5!>8|{JJ-gzF^X~&YHAmVm z$0?Py6e%BRANX;5v|C*&1pRB&#a$8!X=W+J#AJ1JhsJl`<1~Sc;*k{4H=+{rIH}YgvzUICbHEp$h)TNh= zJpVnV-an6N9=V6UHk?*pecf>UqP;lw@DBaIwqCupT!VYm>bf9^R>yWpeO2CMt2#gA z?l^B$X6KP|UG*A;>tCZETnO^qsnu`Zt_GoJIt;w{^*1ikG^r~lPTX~NQt%*YuQc4+%&(zWc?*hxr7esC;#!{uI zkp9oEmioiDNe;hduEA&Z^y}HGVKk!(lJ9^1Ogjd(`E({May=vu(<;%WY`o$NYE&g=j!cXSUn>**Dybou8@cw)6z4P{4Z@e+{wHdFz zJpH9Q`aT&i}~`|rK`&RbILE3dqaYF~We z`RASm^QM9Vi2T)8#Jg(c@?}exNWIK!ME2`_dHVEeQ(t`Hh3Ee93^8+aiFXyrymaZ3 z&p(IE3m`MvOES-b%&7PEnKNg+Ld~6u_CEKIXNj43zgoZEllcp7ugL82zWvslufMKU z#q~b->@&GwCN+Pxew}HrRaa$oz@c70c}LLTKWB z9x~@XP0XfV=<3U*OPCkkOT1h!6b)YLUbL5W^}Obt0_F{@XRnVwgRa2)@f;{xbj7?g zUwak(EA>))pZ@!lC&7&Nu3f!yRBG=(o<$!K@8ge81T)&Z3uR1i33a`qD{W+DY&`h{1|>R}WJbM@ z4h1vI9BgmEF-Ut^&uB06j(zMg%{!QwKk zA%n70au7VRuOo*A18$rS#yk5u(xrAf(uZV(Ulm`6{x`nvYs1QRl)InYB)X8hLAyy7 zOS%w#1CnpvglgFYliz?{p{ZiJ5WHf8O_N>~d&a|^m|5fv>~oBdCEM>0omuaTO`>|) z$I4V8cSZG5#Z)i*I^A5dE0z4S3_J3%Fb%{kzHXiPN!Va-s-O$Sj=oENgM6JCI^-vF zp9VAeI^!qFe#4$E5?yH@OCiOZ>~nOz;$w}kTfYu|Qra8T^GCj}P%qDK^3Rwmu!Wc^ zs2S~Dx0YiWvfpg`#RiMatScEh+(+7egO`{^R}=@qUlFgC`J+6~*S*2Mo$WXC{zIlH zn4xE?mwX-S{Y>+6|8g)RK9+5v_$x6h7_u;9>lS!EhxJS`6xm=MkBE;YQz*U;fe?Hw z?Du4HSEMW7_LGklKlvf~Sn*flC*fnstPt-50#{j=vc*sO?up04AO=bpvjpnBo!CV+Xh=n8()*fa8192W$9JI55%zn<-% zz`hQB1Ru*j2kqs0rM(ioaa_Q5ln1ovS(>E9`n$@Y`K!sA@?Inb4u0y4ws zaQ}+TGWj{~qe;kt5c?eBWoF}_OSKTigVp-fB>@Hyf)P%}+Ji3`MjGcU(Meq2C$ zX5PtUzsD2rs8QsuxQ}44;5Q^@^zFCA1={G4j}>3X^}=s}SuYB7T!6I*;sObhwb9|Y zKxC$Pgnc{wt2i+?tK#4?kwgO435zRtu2#y@*&uc_MCk<1)_(VztH$l=2u9Xe#N@pblQ zYtyG}{V4!v>wuMx@9ebor+`H}VP5HA;2CGn-efF}g|{f9A!aaK1QbiLom8p|`LT2kkE!WI+iv!*RUNM)(cA zSRtEa7CI2yU)YfmHqMR>I4wpYGdo$W=a;}M2HZG1UL=`5BB#R(%8!UwFF1^&^cGm; zI8d`JMvd{;x`J^qyrL^w*paRz{>EIvBn2}sWRn6Cy*Oh>NsdF>`?6VZkmKN37R=%( z+39F!XWAQZl-O&aMH0q_S&V9DCmR*Cpd`bxz$_?d6R&o5#>v7qP+$P3Lz4wHi<9LA zhl~v}hQ`?ioX#{_a6Ctm5G`aWh6b}N>?jb@3p+$nc^`iG!3VUU^cGmMSkVqk7KO~r z5g0oT9lTTEk3ot4CEnLaX5%>6QF6U7Xs8+Eie&zb7Fg6?7-6cH+RODyd%2T5=T0&7 z1YX!J6Gth|-E($YX4Ff8u67*cWTjr??DXP{7L@Wu@ zYSfD}-Cml62>is!>O~R7lC0huEk)Fk2 zL09A`W%9Fw)|*)5beI=?G4l;tP{O8y(2}G}TKB zS-r3eI=fWW0=KaLJBg1jTJ=?wdWE!;rlPb0B0~oV)59h&Oe1fdlNugP!6Du%Czc8Inb9iDaJ@tM`{{FsuOhvR5zMb z$1@WO1BB`jV~rdRC|fB;bu^4gi=Iw%JOoCie^)ME{BJXB2M3XoL?MF8qi2h~}lW2{6`9jSAu3^h-6oQKf_ zHc~7NCqPmn1{Cxag|Z20)eWjR>ITWE^HrCw(%kC*rIc-*{@pi$5C5&ZT9;qtw7Ih7 zFY!=C3*1XP0f}x#;-(wF%-}Eh{_?bRi@*^Ls7&r{wK%c<9)Pd7*W&n@<4|xXZWw~sw58R{Fz=TqR>L@iBkA4is z0~$k8k$#PID$)f=Es;7PWg*>*G>FRhLB}fW+A4a-(&F`*xOpwlX~eH_ThTjxGHpBo zfl<_JWyvbs^G$JorAoRly|6~Zr+v~lUVhugGrY4;;alIm7oDGW8k*wbJpn74rSc;o z^iWFuFH@G`2!eY$i1Bk(Q@RA2gEdoe?$J_vhILRK_^FWp>qi8|HTb|X)##OjcNnGZ zvfcf=(?DUp-2`N-oA3*as5%JNJgwnVEEp&=-?Y`Pw==1%Q$E5!{pL2Q{yTiT$E#?U zFN@dRZU{fU8bw^Qh>jQ>$OJ*?-nG%?ZK$!?)_L^Yacngn*GL_{W$W-%@N|G)`r|~y z4p*gIy&d%-hYMrds?5Q-V7t4QAg?41Z?2+; zS{g32mYgUIwZ{EXsr80Iy*gnkG(}aY8eib`Sg7IyszP1jUPKq@(Uk*P<5abg+qNQ1 zR*3iTHkld^|L`*r!P756vk)nuO^c&X<1KM6PN67&Fl0w#MH-exuO1tc7E897@no9n}1 z`-Z)S^byihqAH5N`GzNjHB_#Cgp5f2uI7J+3%f_K8&yK8$Y@3V z->8%vW^?IMNt#?LDy^ofp<((M81dVsBE61EWR2^8cn9I32I-IB5ZbrA zzU2+S#6TVqT_uNbKk~lKA$0oJ4#5QStS>K)ztU;l@|W)tD%gH~IQsm+isbvdgfZ>V z2lNTJgfV^bCS;s$9CtDj<|BXf^)YWKHD(^ta->a2I59c)5u~w5&mzH%jGcq@B@zP1 zu|+7urVk&*D+?sPP2!;5b|b4g*s_i!1t6 zv+K$gJjO#2Ef=T#Knm=ZX5ygM#m*Od0k13$X{i?D0^|zCv~k3=T$pwMQdqY22Njbg z2uSqG1Yvl2f7rhiw}Fbuq5~IsEmEvQaY%fcO3+GUuUUOaD9#t+dWBJF79J9gONj}+ zuJD%|9Fj9*iC#(20%JcfFgPlgYkKkEttsfKBVJ0>_%FN>?MJY+?b_bdvi&d7)@ES3 zRSdr0M&7sC+9$uo*3!lX-T+B&cEp}Z@>?PGMv7#1>vK<5_j~%>+q)~s8_KKY!NCgl zjPn(3Z))QiXZ;q*AMi5CfO-4h*>E|Wrg}mdx{y8rQ$6vwcws#v@h2ikSm*OcU!Qop zQWFu2PRv$n(w#_%%qP8o^cK>5q?Jfpkcz=u4e3~<)2M_WWU6b@`^h#rY|L_K5*y-P@t+2^$P@Udmc&vx&5$&Pwe3VQvUU&g}Ei~6|_O=_YoT}a% z`i^?3g{Fb!rZ+C{h^@TV+j^+Jq3)hKdyZaib7gp}bIBRMh0#t`d(0NZ%tv2SZw|r< zeW?hRToahB2$JLOlGaQ>@5jV8#R*)*Ub820k{ecy4%QIwK*k;MWwzB6vTTj6dN6c| zmb;ma=#?L}F8u7iLp6E!DGgDBt+qB@eW=!AW2u2$uZhmln=F1yUG;zcDxRjiU`okI zu0MF~Q2dAAN7RaR?sAt{HkufiCExq87z?xwG(Eo5i2+{H{{ZzNyrUPbu}$O1$5Gfl~PirM4j$+>TDzge97Kmpkt0+&QyzX6Eg;-*(%rw|44; zn5iJ-COURGuB+R{zQgKlXNGQfZ?kW8JB4nsI@*82%fUbp>)f^Llr{OkDcFgVL3G+h zPLAM21D{F|qVg_Xr{vcw*i4V3@X26)EJRM1@aduX^X$2rwDTQL=GQ2Y15WbviGCUb z2SW65&zhQcL#Nwro%~fkj$l!#`g|tNL&$lTPjEPYUfsFwJZXu0qutT^Q|M;vrr3=g zZtQTw4fge+_Oa{QwQJk1ZS6KCZQHbw|M6A|C?=(Y4TAFa*R{Vc)Xr-A>o#uN>TR;C z;nisWvDQ)w@cj69X)Uz?FN6GkT4U1hsWqzmr`FnKt~c5`-PyZdAGdc}AFKDCyL;Vr zSI?e3x_9fA)wRnVH1MRKN^j}ir+1$|z0>;?^uF68%F5yaiouDYc}vGX-F%ZCem(p2 zd1h_?@deg5yLcF^U1Od(;?pU5Q1$Nf48|WFUZdmXAkmN7=%dRxbu(|S8Gt?ReA)~^ zeI%TY{n9a53_v+`Vg}&Xx82cs%2)bfr{s|@2Z83*^Tyx$>pPOzH{RHx!}aa2yRIEZ zTkBTWUUT);S6%tXKeoL5@`&R^A|b~`iben(WXM>w+Ql(U?KbBVINsHH}CvC9cT1MYCKj}mQrq&(RXUB zyfjuC3za6KrN`mT9%TMPF}Exfvr64qDrKJ%^+w+J*9ecQ@6-s7l<%n#rv088q1t~` zjqoTzfQHwHj4D4DUlz7j-BITwo}(A~y5$Bn(>dmwuK3h+KT{WxU9EP-vgFN7QWo9r zq%!2&zv7owOV}^tzcE68XXNmwnCf&(r<-oVzHxz4_#bb7zWLxy9Xept(60i->kCJP zZU_|=(^dRGciu?5U8ulPVBnvl>^AiCApcx6s!iK=xLm5KLv5_<@aI`@JwatzZQ^a) zw+~bn{!to*-EkiEW!yO1EiP~ikb(cuy2MQ#Xx^4mmRdN5V#MgjJ@ z=FS_{rj1(z&EN)spqvOoZQ|FVcbVE%h(6jUm5mo!|$yjcFSOI4Y3`+w-yd{oGY#f^p;~?9VpF;#4o?*nm}*; zcun(rjGBlyO8Py9HoEPo#|}!5Q49SZ8`83+?y(_`!#&20@_NjPU+wo;By#yRm3l0M zW$TaEu$U^x3ytwUbZ>rz%B)yG$+6G2!C1$FUAE1R2D@yB{4C`O_Qj46E}H3;8V!_` z5)IVyj%iAj~+99d*s{(0q zIl(%9g_3D8Pun7#PgTj^w;(36)%0>#x159tp-#NU6&9VgRLHW^FaIj~XOvPWLppXC zXo-~O;w7haBM&dMuxh!@a01U(4f3sx`{*SCcxsQL4vK#1wO#e|cS%4%4{LHZ#~Spm z{*%D6o!3>k#wYqI2*#=oVK7!f>bLouz)I^b;$6i>;`wAg6OJ&M{LpbI!rHKjNKgVF z?59)mAmK=Q;erL9&?^9coo{`;6T*>f^r#yx_bA}`;xl`3368|m+2xPt5oO){H7qVY zTS|cuJ;tp?!js(m=oA7OdYFW$kILUk;XYR{wNvAkeqn#Udod(Le1sJuf+;#e{^1A2 zQ3C=mBMw?3u)JCn2+ZZnF=~1$j2`{KGbhBAn*W)p$7qqo!lM(!B~Ntmvx0PXo1PeX z56^59r=7ouR7l-|>b&+4Bd>M2I(i7rFw(>A^ps+%J71x1gi#brieN^1^q6(ViqJLc zr*ht;_e-SWp12GI>9u7`?Io)rD#iCOm702bcKiv$up%o-o8I^{J`ur;7TI zM;JGf7x*G8JqS;Xc#MaR#p66aG177VX({0RLJ1eTU7nHRC*8OY=>-X-Q*a5JaHWCE zQoCrN_#D)<4?eKpx8B_&N|{L&;k_An_;On9sny&@Tmlj* zfla(PTv$``lN2FX8?5yO;+AFajvN7=O%&gQXVW=CNY7u5X27RXrP_saFd-hC{2P(t zJtR6rK>ZRT2sPKwF%C*5r}l~caa4~E9U{;kBElX#Uda-pQS^Qzd0r8|!v4hi_yBXT zvj~O=CRhqMZ0&Z9*WgfueHlINnCh-j`T1Hy92|Kef_7(+kY1ZZ)qP}tXnjyju?5^2 zp8dn$6QK~nUjG>@O{Bg;yjo*wDs zAc!3(KQc(q!M$Qa1nwpYweYt!f8xao~I?3vaK>y z+N#qV1$YDD1T3~Un?J4{(|Czxfi#5a_lZ`+MVQu-6czq!l+&AC;Q`)rWcC7hnM{L;9`dJps^x#K72!!GK?^O)y&VwQ2cW0y^#;N^iVis1F}~Vt zi1=&kPv+b6_8{8P`vA1_KuhFQcMC-a-Ub4_`+)XFXv<=;y{Ld*fKWL)(5qxx#-m2r zBH;!?*Yw^5-axSDTl2P1K*F;{R;283#CN8;Wwe2?%3krg-sYho&Uc}*x5B$5^wNgl za-KF2=Fj8i&_5Qw$BMLcgH=$#7MKv+#12qr?MS7u0a z*khAF=M4lrw68Z1HkeY`FzL?aod&d;k8UuF*VlD%!HfsZ=+r=oLW=@x(14-$wWt zutf2@d*hf`1YpM*lRbwIW=wtxrkF8oF0H&7>-}rsgnG?>wH$A0;e1)E zO$Cmtm#}Dcfe<`=%XjKji?65RI{uolO2KdX4&l27N|-v8T1721t@Xcs4N%^Zr-h0) zaYX}P>Ty7OJ$f8a{2}9j_eEqJ@VkY)alnBP_aDCkD>x3`^~M3cafxZP?`6#6;MG?c z(`q07oH1`&O#LawLFF62N1i4QJr;1&jBNtFgw%`$+&(ilfp&PSU8e2q11V}1792W z;%nlMtkyseq;dLB-*jWjp)#rLklPmb@PDeh&cwyX$>BkjF{m;IRmR|mH3l3VT=SEi6d3js)pQx35jfKCl*^d`UkgXpS%Hf8hRq3z zBkwM`X?gJb$kM{U9t%g(UGm@^gs@hMpJUiuNm0b&SA{8$csrZezV^%&xXY}`T{LZ#IR7w0JYk+jj ze-!7Ze~)U7R-GTnx+mQ5TzU!U4|$6!(f^#^qH5l`3^DgUNy6e2c#G=Z_m$dL7wIIV z)8(?cz85d_Da0QLDLe(~9Hh&T+9KVKgtzt@UhVt;s?+}G literal 62379 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 Q^YUSP`diG|bSUxv2k}ol2><{9 diff --git a/components/smsplus-esp32/menu.c b/components/smsplus-esp32/menu.c index 70fd615..d47cdc4 100644 --- a/components/smsplus-esp32/menu.c +++ b/components/smsplus-esp32/menu.c @@ -173,6 +173,20 @@ int menuShow() { if (v>255) v=255; renderGfx(overlay, 14, 25+16, 14, 193, (v*60)/256, 4); } + + // draw empty battery cell + renderGfx(overlay, KC_SCREEN_W-16, 0, 0, 316, 16, 7); + + // fill in the battery with appropriate color + int batPct = kchal_get_bat_pct(); + if (batPct < 20) renderGfx(overlay, KC_SCREEN_W-15, 1, 17, 317, (batPct*12)/100, 5); + else if (batPct < 50) renderGfx(overlay, KC_SCREEN_W-15, 1, 33, 317, (batPct*12)/100, 5); + else renderGfx(overlay, KC_SCREEN_W-15, 1, 49, 317, (batPct*12)/100, 5); + + // add lightning bolt icon if applicable + if (kchal_get_chg_status() > 0) { + renderGfx(overlay, KC_SCREEN_W-11, 0, 64, 316, 6, 8); + } if (doRefresh) { vidRenderOverlay();