From a774ecec604e4a7961dbac3418b700de556a1653 Mon Sep 17 00:00:00 2001 From: philmoz Date: Mon, 13 Nov 2023 12:35:22 +1100 Subject: [PATCH] chore(color): Remove unused bitmaps (#4312) --- .../default_theme/alpha_trackp_background.png | Bin 5110 -> 0 bytes .../480x272/default_theme/mask_asterisk.png | Bin 2038 -> 0 bytes .../480x272/default_theme/mask_back.png | Bin 1056 -> 0 bytes .../mask_model_select_category.png | Bin 803 -> 0 bytes .../480x272/default_theme/mask_modelname.png | Bin 661 -> 0 bytes .../480x272/default_theme/mask_modelqty.png | Bin 773 -> 0 bytes .../default_theme/mask_monitor_mixes1.png | Bin 1090 -> 0 bytes .../default_theme/mask_monitor_mixes2.png | Bin 1091 -> 0 bytes .../480x272/default_theme/mask_moveback.png | Bin 653 -> 0 bytes .../480x272/default_theme/mask_moveico.png | Bin 756 -> 0 bytes .../480x272/default_theme/mask_next.png | Bin 1053 -> 0 bytes .../480x272/default_theme/mask_sbar_mixer.png | Bin 751 -> 0 bytes .../default_theme/mask_sbar_output.png | Bin 791 -> 0 bytes .../480x272/default_theme/mask_sbar_to.png | Bin 631 -> 0 bytes .../480x272/default_theme/mask_sdfree.png | Bin 534 -> 0 bytes .../480x272/default_theme/mask_stats_lua.png | Bin 1226 -> 0 bytes .../default_theme/mask_stats_value.png | Bin 1292 -> 0 bytes .../480x272/default_theme/mask_switches.png | Bin 536 -> 0 bytes .../default_theme/mask_textline_delay.png | Bin 630 -> 0 bytes .../default_theme/mask_textline_delayslow.png | Bin 891 -> 0 bytes .../default_theme/mask_textline_label.png | Bin 492 -> 0 bytes .../default_theme/mask_textline_slow.png | Bin 815 -> 0 bytes .../default_theme/mask_textline_switch.png | Bin 666 -> 0 bytes radio/src/gui/colorlcd/bitmaps.cpp | 88 ------------------ radio/src/gui/colorlcd/bitmaps.h | 23 ----- radio/src/gui/colorlcd/menus.h | 5 - radio/src/gui/colorlcd/model_mixes.cpp | 15 --- 27 files changed, 131 deletions(-) delete mode 100644 radio/src/bitmaps/480x272/default_theme/alpha_trackp_background.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_asterisk.png delete mode 100755 radio/src/bitmaps/480x272/default_theme/mask_back.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_model_select_category.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_modelname.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_modelqty.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_monitor_mixes1.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_monitor_mixes2.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_moveback.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_moveico.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_next.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_sbar_mixer.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_sbar_output.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_sbar_to.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_sdfree.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_stats_lua.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_stats_value.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_switches.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_textline_delay.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_textline_delayslow.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_textline_label.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_textline_slow.png delete mode 100644 radio/src/bitmaps/480x272/default_theme/mask_textline_switch.png diff --git a/radio/src/bitmaps/480x272/default_theme/alpha_trackp_background.png b/radio/src/bitmaps/480x272/default_theme/alpha_trackp_background.png deleted file mode 100644 index 5beada59e4f6cb2101dc5ef437784422fad16b1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5110 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 Y|0@ir`kCY@b^rhX07*qoM6N<$f|i`lu>b%7 diff --git a/radio/src/bitmaps/480x272/default_theme/mask_asterisk.png b/radio/src/bitmaps/480x272/default_theme/mask_asterisk.png deleted file mode 100644 index 09c96f92400e1a2a5cb5332e94408ed235a0b18c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2038 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 diff --git a/radio/src/bitmaps/480x272/default_theme/mask_modelqty.png b/radio/src/bitmaps/480x272/default_theme/mask_modelqty.png deleted file mode 100644 index 9a38e4f13dcaa706050cbc0e4cade094077257f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 773 zcmV+g1N!`lP);O*@V$8os1xnX5xh57k;g2A9y+8=mT zGfh*1!Jq&FNTE=WrKKeSWOa2_s@1AkmL;}rOS9SZ>{tP?EQ_nFEB5#INhA`4!(keY z2B}nvbUMx8;9$FvL?S_iI(@o_Xwqgt)vx-PbDqpB*lZBwt;JBf?MBF$zKfQyR@hK7bXIXNL3 zjk3A9$@B9w%gf6=Jw0I<29ZdFv$Hb*8jS|oY?jy8R~*NoQmOF${r#JHV`HPOWw~4y zP18EGJw85`wY4=F9v*J{z0BwHNivy~ot+&yKR=g$5-W<*m(a^%v6!frmzT6!Edcy} zfBzNw4|MEttJUftuhnW~G8ulZda+pK;o$+l-;b{AU8G}UWAr_c?d@$eP2=e3i0kWX zK0ZE3rBVa}0oK>o357ybDist(=_crPl7D|zsZ?qo$l>9k+}_>_AfZr5Ow;ttSAQ1L zb)9m#Oub%bcXyZR>1h;2K~+^27Z-`eV)%T%cD$-~Q2@|2Lq4C!FbrJR<>26eNF>7P z=_!_Fad&se%*+h;_xAv}u1hYL>1HZM(%1Z3*?R^SNrBbk3t&m70qHl`^*VfjG1S%>jz_Ki|*(_F8R!~=0 zhlz;^ghC+zfXCwzji)FI!^6WkI5;Q{9F0cd@pw>HRtAMa0fu3a&1Nw+HU^W)1cqU- zwY3G6N`;Gy3jn~<(h>+E=;`S}Fc{2Pm4d+l5DJCBFbsH}huLh#$jAsXnT#Oj^?IRJ ztHCgg5M!R_^M<1+@Y^n(oScNwXvFL5YmT7T>qSjX4FZ9{r~9C2u+?hC;NT$Q@i-P2 z7jb@mo)@msXmELX`8D8$g#`=@4B+ME1pu(Uy$wPLy1Tovv$KPAI-LW*zrX)Ga3Ya_ zTrNi{l@bZ)^?G5PLZJXn)3~|00RYf64X4vtFgR~sjKyMvq9{U9l*q5uYK7;!yF0SG zyGxFbj|m}!=yW;~2n6z`O_pVIogXc=*=)wl%#85Y!C(*+ML{Z+!eB7q@bFORi$o&O zYPIlsy*aaee0)S>V`Jel<~R=h{r#Aoodp0`EEY^pPvh$9Do41fsR?ekI|s_LESj5} zMG2;$UCnVE`uh4{v)S_IZI)%x($a#Bjg7ojtzZ61I6p_p2(nkC;mSsWHG}LM}2q9lu)M_uh%OXPf-*G2M4jYxA!q{EEa>;>qT*KF;prQ7=}SMo5je;2+U?P7>2>d z#s(@YD{*#q1^`%CSO6geU0q!Wg+e*IQZN_*!r?F&hJhdmuvjb@8X7_-lM%&yJ|8q1 z4H$+IeJltxcpUTd z^Ef>{%?sCRwKzXN{~GYz+#LG)`tbDh1OV9F+yo&6ot>T7+S)=ooz8*Z-roKlIFU#| zsZ=7BN=XC^27@?GrBZ>WX!2k@9&F!(P$Jp zoen;qFK4y)_xGr;uP@xkJkO)Iw-?jX(*OXg)r!f|4 z3R0;Q%FD|oV}JhqDb{}_lH#}EYmuTTxZQ3^48FX)L^7F_oc8wi_Pp~y1+J~F#qsfR zK}i6|aj2-M_&c!GYK7nLm)u0}Su&YKM@PqpSN!88?^P%iBoc`btyW9)dOb-b691XV z@jOq=W-~cBI4CIbQz#U_qv3a@x8Ih~%U-{o{;wyD?7JRq{{WV&UL`9gV;ukh002ov JPDHLkV1f)D?KJ=Z diff --git a/radio/src/bitmaps/480x272/default_theme/mask_moveback.png b/radio/src/bitmaps/480x272/default_theme/mask_moveback.png deleted file mode 100644 index 63f56df9204d8acd2c24eea10271cf37381db2f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmV;80&@L{P)@pzoK!EsU|k>G7`+%NjuvMdWepASSN#4*Mox!rCm6bi4} z(q6BZ>h=25hk1JV(0;#%qA1)K z{ny2yLam*Wn0ga&}^c8gRhB^DY0*6TH*(WqEx z08mvGe!pKVGyqH{6K;!t84UoN%?8l}eOlnE<%Dy2|(W_u0UN5Zu|>Apk?Sx3~HG`#XJDEEY3? zx~i(`bYWLlSC*izCX>nOz)GbOS5{Vr!rX2*KR!N2!sanT-rn924u|pc^MhuyiBu|O z>>VE;V{vg2E|&|hudmqJ+8P>5BFRy}t~44AIGs*oE`-3+(vn?w%vmk!x{h=@Z97P> zWV2c5x^BJMpV#Z_Yc4M@GZKjmTrMLN3gPML$vAPnUPrA~Gi9OCXqe`;T5aIY>h-!YzP!A|%gYN= zsT5>c1`36O(Sl~Bo12@|G>uRcWu~C6`u%=F)3nZDh9Ixk%VM$EDUh$PFYfQ}n+%SQ zjwULQ!^1<9&F=0l%jGgjat;7CHa3vU<#2Iv0ZEbo01FEXm_&O0R8__O{XKj>UuU8J z$?op%D9bWWPfsU0StJsn$Kzo>pC8z>Y{Z|RpL}?Dm zZ*T2{vHuUEs;VU{9*^4%VIS6NwYaypX95L-LAKlN>BC5}QmN4A^AP|8fdIe1zsGSO m4@Q#te4dJ;P}8(=UHJz(1gkx{&sGTl00002h5)+CJzK|Fu zXkzT<;NT)J3yCfc#xT06!GFO;on< zZ7~c(lB7jFb!_x{z3c1i_4Rce#|eUnMx%Fkcl~}}wGrutk`V7sw;|O zp-{->a;;WtB3$NbrmAYc-_PZ8p->1#f1M0P(NHLKb8}<1c$38xMQJvhCnqOfulF~^ zHd`zfGg~~w$d6=M{`mMvCX-I5Q`2)go$+{_<2YHCrzxhYsw7E|kB_lfOe-D$!0mQt zG8vxd4eDXpY}OD+C^|nsKRY{HE|E4|!QkcPWxL(}NzVizf5X!4cHiFKdcEGL z_U(52<>f_D6q=?fiu%8R{N3q^L;^yn{Tl#ab#?Xr{@#k~kMBI1ruX*td_JH4=%1gT zwOY-J>yHmfk_15*3T4Xw^<$Q0*;1)A#z(9;h~`+D^I{kliA3`G{9rJc znuEx)EC|Bc*_q$(*Oauu-Rt$H=8cM?v|6pJtE*rzs2K+U!0-2Gv)S=RWm>G?@890u zuC1+M7-nsLnwZqZVv%7OJ?JwtGpSU{_-23@$1fg_>&FU&aC>|E>FLS%&Vv}qiQ~9~ zg9DGpqd{S_*`m?t!^6XHIGoycCCl>j^K&|#)`O0s=;GpHE|;6~-q`7M&d<+%KA&F6 zIDY0_|Lg0kQmJU`6ac{E@uX6zbUN+zdd*&(CWt`@DT;D98~}ikqwnnO93CFhG_AGT z)GmVrL9i@auh*;9Dui%jW8>)PXlZH5f)autVEj#FbVcJhj^}xbqQc=YP1E|(Y%2Z( XqZ5q}{x}}+00000NkvXXu0mjfq#OU5 diff --git a/radio/src/bitmaps/480x272/default_theme/mask_sbar_mixer.png b/radio/src/bitmaps/480x272/default_theme/mask_sbar_mixer.png deleted file mode 100644 index 1544064194199d94ad04b1feb20f105fc6ea6bb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 751 zcmVp&ETkEL#{t8TkaiD)edwulcP6isp6*H9_0 zt8d^d2r4e5DCkCF{~&EqN;L?j6|}lkH$Hzxe zN=c*95YO{OL?jlA$>!#!+}+)Y48J%S46rPVLZN_Cird>;48x$&XaI0}dWvb9^m;v% zQWOdW^7%Y3FE9Gk8a9-ml%ig*V;BaVPAA}#ZQCT1Ngf^^LW?D%3qw$~TIKESZ7ktC z@UO6;v}Uu3>$+qz8P?a=xxBm#B%Pn1W11%Yem@-Mx-K&_Gc=n`{j$|+F*!M@ug%`x z9v>ec0Gyqjk;!DjVS~YdY&JV~^p%yBK=}>B&=MCH7kPbs4VRftr?G8Y&)e;`zE2Aa z3+(Uj^ZEG+!2SI_hGF2kZaB}#)heY@2@%1vES{gA zzhK>NmtwIL8K_U=JO5F^}BlO`wpDpX-_7T!QS2;78VwO-rimU_%)qQCoe88Xck9D zM+Cr?l@I(+uL}2d;|c@%*>!r zD46yF08F)a{M_H)uPe;ua)!Dr%k=yG+}+)!<>zm{VsvyA!C+8-%d%{!tE!62%gZnI zok~)v6elJoI5;@S@$qqFJ4whliY-oBMGkI;>u=b7*LY02qx%`TqXScsx#r!$AOaI2??}<5X4E07$3P^!xpc zMx$-m@$oSM(ChVfjUh>ru5x~Uo(~TXdVPO?p8yyNh1#%4Btih(+S)Q5;r#rZZns;% zx%KsRzP-J%TCGx16qZV*HtgWwfB@+8`S|hiVG3+C8eCgjqs3w&0D3$gUSD5#@9g>c znIj`31VER|#igYs#$qwv-QBU-Y#N}qx3{{xf*^2pb(M`q!|3My{XJ)AXS>|A+wBYl z0^Ho(&5W!Fg7+eV6)j^3i}RC(~wT5;dZ-GtJU-m^7%YoUtbNqk|Y70BmI<4r<01JkR&xt zW1&!BEEePP@-oBWFl)6M@$JmNG8hc<^YhcxW!+7y)%q)BY;25)M1rkW>sJs-{s9)` V3w_XAKwba<002ovPDHLkV1gETXnFtu diff --git a/radio/src/bitmaps/480x272/default_theme/mask_sbar_to.png b/radio/src/bitmaps/480x272/default_theme/mask_sbar_to.png deleted file mode 100644 index 813610307097c64a9d83ae1853373c73551164a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631 zcmV--0*L*IP)JbYXrJ0Sjl5EIMUV&mOvA348 zQr>_!fR!R88!tdI8}=yF6eIsi(%A63n>+Vj&zLdXp66S$`JLZ6pU#<@IgliYDwPVk z-EIQ# zR--5irBW%=JKk=$ca8=oA`%4QDXhMlLZLtm!x*AG&ufgkqgLbfdQBZ4!!Rh7N@%rO zu-R<7eS#opY7b$L$72ds6OYF+7z}jhIh{^(u*2ba2?hYa-w#m~5ekJgV;sksgFik# zUWNgH=XsRNWmqhhySm+OHwP<<@)lgL*Ab0IalKye>ZjAm9DF<;Ujm5;`FtM9WD=Ll zMKgXl95l6`j}}@i7N$`}QIJlj(QGz#drZTV$;1@8+wG7@B+%>i4EtnR*3>jdJ)KUm zTCJXdBuV>|`1Tvfe!u_rJC`iW^b5FPK8_5e RZ6W{w002ovPDHLkV1k)n6pH`= diff --git a/radio/src/bitmaps/480x272/default_theme/mask_sdfree.png b/radio/src/bitmaps/480x272/default_theme/mask_sdfree.png deleted file mode 100644 index f0ae81982133a24adc85cc8950b66f52be40d55c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 534 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 Q*#H0l07*qoM6N<$g0L1E*Z=?k diff --git a/radio/src/bitmaps/480x272/default_theme/mask_textline_delayslow.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_delayslow.png deleted file mode 100644 index de2f7d1f74e2c2f88c1ab8831352f35c30abd7db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 891 zcmV->1BCpEP)Mp^L__3M zYY>zWQL}`Ev?#QMLIoK_LsJkDAry#2IBB25ttCiP9J&_X|9OX(r}u%Ehvx@pJcq;K zpr@yY0RE^%B0-PG!?Uw9{z6q%_V@Qw_WS*qot?$V$O!7{>hOy~p@2vvf|;2aWV2bM zQYrX+J^;YS#|IQefvnT%Fh4&JyWNhbrzdEd2D{x3olb|t!$auxdbnIJ#N+Xw;9{|e zrluw!o6T}!VuG1Wh7Ao31i+1r4aVbfuCA_l}fR@yPLAp=|nIX z#QOR=_V)Jh`1puov5337JA^_ZXqpDA)e580h+HlQhr@wlu?W3h4+#LgUN2&?7%nd_ z;rIIi0Et8b+uPf4xmV{{Oz8*ySv=q-)D1k zGjq8dNpf*j$w^?KRZ*vND`O_CHs&}Oso;o*U}xw+x>^))9aCuuU7I6gkk z>FH@Yole%**VAAy@Z#d)C-C_An1h3ZBuTWkw$f}i(`K{LYPHg0v9PPFi*C1@kw}E) za+%-X-+X?4W;h&XXJ;ofnascDv9U3lOs4)l-d9Q diff --git a/radio/src/bitmaps/480x272/default_theme/mask_textline_label.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_label.png deleted file mode 100644 index 8be12e39bcba3dbd933f9f148f56063f5a9afd6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 492 zcmV$_90eMM8 zK~y-)t&^{-!eA7J-^u<3Wr#&grWFwkrp+Q2%WNhUF^WI_1<`1<8AU;GAjm+lDOgQ{ zFoUq5ScDDXH5ukE*NuB0IPit}5;gCUiOGE%jCX?7~Hc(X+ zj^m)&YzEqT@qLKL<5;iPP*oL{Wue#W`IZQuzxaGUBbUp;vaGL9kh@0Jd%8 i@p$-aMHGLQ1my*Dy0TEzHs2or00008e_57)8oa@!KbmMDNJBz*h@inCC`_Uj zmxds6hz1)QgNPObhn5O*i3lQ+NQi_62OFv(sG&3poC-2AtjN62JA8Z>Uf!hxXE^X2 z&civ#FAxfaH`uh6B#4q6U`N(FohJJf{OOKVzF3cZf;K8Znun%j!L85ZeOxmtt>Auv$wa$ z?(QxolL?Q4l#PuIEEWsVXq45} zRim(lg$2&f&(U=qfJ&u;q9~Z|@9*j8=-~A9ltd!I)6)}2M@Ou!tx+zQ0SE*F6pKYv zRW;gH6a~}Q*B7s^uheQa^7%ZOOoq$LOL}{IDHI9-)M_kKma(xhQ4~c&p^!{YPKu^!Vm6z_;c!SMlQB|Lsg(5h z_lt-~LwkF>w6wI))YL?+R^#XAhsMT6y1Tmxhr`Uy&SEy3sZ=WL?Cg+8Bse}kW?*0d t!r`zeit-nMf2gXeL?RKny}dQQ_yZIrto%OH6deEn002ovPDHLkV1nDddg=fG diff --git a/radio/src/bitmaps/480x272/default_theme/mask_textline_switch.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_switch.png deleted file mode 100644 index 7c7d646e417cb40d27b0b2b4102aaf75bee02527..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 666 zcmV;L0%iS)P)2&CDIJmR3!&0fVOahXu)oQfc?Nn8jxm<2pEEbDv?Ob19Q&m-Jn#N|c`DOC) z@j+eJDIz>SKezOn&*wMJB%MxEMCkYXIUbLRQmI4{VK5lvY&NsN*=%;B$$UO%C={ZI z@bdDK%H!iB03eY_z-F^q=A|eKHc3$w#N%-QfMFO=+U+&~ARG>Fgn!dF-|O|DOePZm zfY<9?1Aiu4mCNM<0GOr;#p!ec0EWZi8o0l||EtN{+ZzDD?RG;sI5+?Rv|6n-@Z{tK zjYb2(U~sM0>2v@9fj|JbxVWH*@c8(6>uUeh;o%`ggoQ$Zm`07*qoM6N<$g5;w$ ABLDyZ diff --git a/radio/src/gui/colorlcd/bitmaps.cpp b/radio/src/gui/colorlcd/bitmaps.cpp index cd0965247..04d4e4904 100644 --- a/radio/src/gui/colorlcd/bitmaps.cpp +++ b/radio/src/gui/colorlcd/bitmaps.cpp @@ -26,12 +26,6 @@ const uint8_t _LBM_POINT[] = { }; IMPL_LZ4_BITMAP(LBM_POINT); -static const uint8_t mask_next[] = { -#include "mask_next.lbm" -}; -static const uint8_t mask_back[] = { -#include "mask_back.lbm" -}; static const uint8_t mask_menu_model[] = { #include "mask_menu_model.lbm" }; @@ -89,9 +83,6 @@ static const uint8_t mask_model_usb[] = { static const uint8_t mask_menu_model_select[] = { #include "mask_menu_model_select.lbm" //TODO: someone may want to make proper icon }; -static const uint8_t mask_model_select_category[] = { -#include "mask_model_select_category.lbm" //TODO: someone should make proper icon -}; static const uint8_t mask_monitor[] = { #include "mask_monitor.lbm" }; @@ -146,12 +137,6 @@ static const uint8_t mask_radio_trainer[] = { static const uint8_t mask_radio_version[] = { #include "mask_radio_version.lbm" }; -static const uint8_t mask_sbar_mixer[] = { -#include "mask_sbar_mixer.lbm" -}; -static const uint8_t mask_sbar_output[] = { -#include "mask_sbar_output.lbm" -}; static const uint8_t mask_stats_analogs[] = { #include "mask_stats_analogs.lbm" }; @@ -164,21 +149,6 @@ static const uint8_t mask_stats_throttle_graph[] = { static const uint8_t mask_stats_timers[] = { #include "mask_stats_timers.lbm" }; -static const uint8_t mask_textline_delay[] = { -#include "mask_textline_delay.lbm" -}; -static const uint8_t mask_textline_delayslow[] = { -#include "mask_textline_delayslow.lbm" -}; -static const uint8_t mask_textline_label[] = { -#include "mask_textline_label.lbm" -}; -static const uint8_t mask_textline_slow[] = { -#include "mask_textline_slow.lbm" -}; -static const uint8_t mask_textline_switch[] = { -#include "mask_textline_switch.lbm" -}; static const uint8_t mask_theme_add_view[] = { #include "mask_theme_add_view.lbm" }; @@ -221,44 +191,11 @@ static const uint8_t stick_pointer[] = { static const uint8_t stick_background[] = { #include "alpha_stick_background.lbm" }; -static const uint8_t trackp_background[] = { -#include "alpha_trackp_background.lbm" -}; -static const uint8_t mask_sdfree[] = { -#include "mask_sdfree.lbm" -}; -static const uint8_t mask_modelqty[] = { -#include "mask_modelqty.lbm" -}; -static const uint8_t mask_modelname[] = { -#include "mask_modelname.lbm" -}; -static const uint8_t mask_moveback[] = { -#include "mask_moveback.lbm" -}; -static const uint8_t mask_moveico[] = { -#include "mask_moveico.lbm" -}; BitmapBuffer * calibStick = nullptr; BitmapBuffer * calibStickBackground = nullptr; -BitmapBuffer * calibTrackpBackground = nullptr; -BitmapBuffer * modelselSdFreeBitmap = nullptr; -BitmapBuffer * modelselModelQtyBitmap = nullptr; -BitmapBuffer * modelselModelNameBitmap = nullptr; -BitmapBuffer * modelselModelMoveBackground = nullptr; -BitmapBuffer * modelselModelMoveIcon = nullptr; BitmapBuffer * chanMonLockedBitmap = nullptr; BitmapBuffer * chanMonInvertedBitmap = nullptr; -BitmapBuffer * mixerSetupMixerBitmap = nullptr; -BitmapBuffer * mixerSetupToBitmap = nullptr; -BitmapBuffer * mixerSetupOutputBitmap = nullptr; -// BitmapBuffer * mixerSetupCurveIcon = nullptr; -BitmapBuffer * mixerSetupSwitchIcon = nullptr; -BitmapBuffer * mixerSetupLabelIcon = nullptr; -BitmapBuffer * mixerSetupDelayIcon = nullptr; -BitmapBuffer * mixerSetupSlowIcon = nullptr; -BitmapBuffer * mixerSetupDelaySlowIcon = nullptr; struct _BuiltinBitmap { @@ -270,29 +207,9 @@ struct _BuiltinBitmap { static const _BuiltinBitmap _builtinBitmaps[] = { {BMP_ARGB4444, stick_pointer, &calibStick}, {BMP_ARGB4444, stick_background, &calibStickBackground}, - {BMP_ARGB4444, trackp_background, &calibTrackpBackground}, - - {BMP_8BIT, mask_sdfree, &modelselSdFreeBitmap}, - - {BMP_8BIT, mask_modelqty, &modelselModelQtyBitmap}, - {BMP_8BIT, mask_modelname, &modelselModelNameBitmap}, - - {BMP_8BIT, mask_moveback, &modelselModelMoveBackground}, - {BMP_8BIT, mask_moveico, &modelselModelMoveIcon}, - {BMP_8BIT, mask_moveico, &modelselModelMoveIcon}, {BMP_8BIT, mask_monitor_lockch, &chanMonLockedBitmap}, {BMP_8BIT, mask_monitor_inver, &chanMonInvertedBitmap}, - - {BMP_8BIT, mask_sbar_mixer, &mixerSetupMixerBitmap}, - {BMP_8BIT, mask_sbar_output, &mixerSetupOutputBitmap}, - - {BMP_8BIT, mask_textline_label, &mixerSetupLabelIcon}, - // {BMP_8BIT, mask_textline_curve, &mixerSetupCurveIcon}, - {BMP_8BIT, mask_textline_switch, &mixerSetupSwitchIcon}, - {BMP_8BIT, mask_textline_slow, &mixerSetupSlowIcon}, - {BMP_8BIT, mask_textline_delay, &mixerSetupDelayIcon}, - {BMP_8BIT, mask_textline_delayslow, &mixerSetupDelaySlowIcon}, }; void loadBuiltinBitmaps() @@ -318,10 +235,6 @@ struct _BuiltinIcon { static const _BuiltinIcon _builtinIcons[] = { {ICON_EDGETX, mask_edgetx}, -#if defined(HARDWARE_TOUCH) - {ICON_NEXT, mask_next}, - {ICON_BACK, mask_back}, -#endif {ICON_RADIO, mask_menu_radio}, {ICON_RADIO_SETUP, mask_radio_setup}, {ICON_RADIO_SD_MANAGER, mask_radio_sd_browser}, @@ -348,7 +261,6 @@ static const _BuiltinIcon _builtinIcons[] = { {ICON_MODEL_TELEMETRY, mask_model_telemetry}, {ICON_MODEL_USB, mask_model_usb}, {ICON_MODEL_SELECT, mask_menu_model_select}, - {ICON_MODEL_SELECT_CATEGORY, mask_model_select_category}, {ICON_THEME, mask_menu_theme}, {ICON_THEME_SETUP, mask_theme_setup}, {ICON_THEME_VIEW1, mask_theme_view1}, diff --git a/radio/src/gui/colorlcd/bitmaps.h b/radio/src/gui/colorlcd/bitmaps.h index 5dd5156b5..5bcdc28d9 100644 --- a/radio/src/gui/colorlcd/bitmaps.h +++ b/radio/src/gui/colorlcd/bitmaps.h @@ -26,37 +26,14 @@ DEFINE_LZ4_BITMAP(LBM_POINT); -// Model selection bitmaps -extern BitmapBuffer * modelselSdFreeBitmap; -extern BitmapBuffer * modelselModelQtyBitmap; -extern BitmapBuffer * modelselModelNameBitmap; -extern BitmapBuffer * modelselModelMoveBackground; -extern BitmapBuffer * modelselModelMoveIcon; -extern BitmapBuffer * modelselWizardBackground; - // calibration bitmaps extern BitmapBuffer * calibStick; extern BitmapBuffer * calibStickBackground; -extern BitmapBuffer * calibTrackpBackground; // Channels monitor bitmaps extern BitmapBuffer * chanMonLockedBitmap; extern BitmapBuffer * chanMonInvertedBitmap; -// Mixer setup bitmaps -extern BitmapBuffer * mixerSetupMixerBitmap; -extern BitmapBuffer * mixerSetupToBitmap; -extern BitmapBuffer * mixerSetupOutputBitmap; -extern BitmapBuffer * mixerSetupAddBitmap; -extern BitmapBuffer * mixerSetupMultiBitmap; -extern BitmapBuffer * mixerSetupReplaceBitmap; -extern BitmapBuffer * mixerSetupLabelIcon; -extern BitmapBuffer * mixerSetupCurveIcon; -extern BitmapBuffer * mixerSetupSwitchIcon; -extern BitmapBuffer * mixerSetupDelayIcon; -extern BitmapBuffer * mixerSetupSlowIcon; -extern BitmapBuffer * mixerSetupDelaySlowIcon; - void loadBuiltinBitmaps(); const uint8_t* getBuiltinIcon(MenuIcons id); diff --git a/radio/src/gui/colorlcd/menus.h b/radio/src/gui/colorlcd/menus.h index 2c6740ddc..5feae9011 100644 --- a/radio/src/gui/colorlcd/menus.h +++ b/radio/src/gui/colorlcd/menus.h @@ -28,10 +28,6 @@ extern uint8_t menuCalibrationState; enum MenuIcons { ICON_EDGETX, -#if defined(HARDWARE_TOUCH) - ICON_NEXT, - ICON_BACK, -#endif ICON_RADIO, ICON_RADIO_SETUP, ICON_RADIO_SD_MANAGER, @@ -58,7 +54,6 @@ enum MenuIcons { ICON_MODEL_TELEMETRY, ICON_MODEL_USB, ICON_MODEL_SELECT, - ICON_MODEL_SELECT_CATEGORY, ICON_THEME, ICON_THEME_SETUP, ICON_THEME_VIEW1, diff --git a/radio/src/gui/colorlcd/model_mixes.cpp b/radio/src/gui/colorlcd/model_mixes.cpp index 0ab6eb2b5..31a629986 100644 --- a/radio/src/gui/colorlcd/model_mixes.cpp +++ b/radio/src/gui/colorlcd/model_mixes.cpp @@ -174,21 +174,6 @@ void MixLineButton::refresh() lv_label_set_text_fmt(opts, "%.*s", (int)sizeof(tmp_str), tmp_str); setFlightModes(line.flightModes); - - // TODO: should we add these? then it would be best to have them in the font... - // - // uint8_t delayslow = 0; - // if (line.speedDown || line.speedUp) delayslow = 1; - // if (line.delayUp || line.delayDown) delayslow += 2; - - // if (delayslow) { - // BitmapBuffer* delayslowbmp[] = {mixerSetupSlowIcon, mixerSetupDelayIcon, - // mixerSetupDelaySlowIcon}; - // const BitmapBuffer* mask = delayslowbmp[delayslow - 1]; - // coord_t w = lv_obj_get_width(lvobj); - // w -= mask->width(); - // dc->drawMask(w - border - pad_right, y, mask, textColor); - // } } ModelMixesPage::ModelMixesPage() :