From afb297b0f611a008d9428a36f48a1179e3d9c0f9 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Mon, 7 Jun 2021 11:52:50 +0200 Subject: [PATCH] Test new EdgeTX splashes and remove vendor specific branding Resolves #154 --- radio/src/bitmaps/128x64/splash.png | Bin 353 -> 383 bytes radio/src/bitmaps/128x64/splash_frsky.png | Bin 495 -> 0 bytes radio/src/bitmaps/212x64/splash.png | Bin 2331 -> 842 bytes radio/src/bitmaps/212x64/splash_frsky.png | Bin 1400 -> 0 bytes radio/src/gui/128x64/gui.h | 1 - radio/src/gui/128x64/splash.cpp | 22 ++++------------------ radio/src/gui/212x64/gui.h | 1 - radio/src/gui/212x64/splash.cpp | 21 ++++----------------- radio/src/opentx.cpp | 8 -------- 9 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 radio/src/bitmaps/128x64/splash_frsky.png delete mode 100644 radio/src/bitmaps/212x64/splash_frsky.png diff --git a/radio/src/bitmaps/128x64/splash.png b/radio/src/bitmaps/128x64/splash.png index 64ebfb9d56561b8f7656ab17bf914d3b5ad4e47f..ebb8ecad722e6e62e7099dedc7c4dc9146a2c563 100644 GIT binary patch delta 338 zcmV-Y0j>Vw0{;S#By1~mMObu0a%Ew3X>V>IRB3Hx08MXhAU7aNb#5RsFfuV9Ffcka zF*-6eAT2O8FfiT4vUmUh00(qQO+^Rg1_uQaHLymTlK=n!32;bRa{vGe@Bjb`@Bu=s zG?)MY00d`2O+f$vv5yP5&36_4QP z&;*XgQ8+?J2Le8@Hqg<Usa{y;MxJlQC+$9bm1_q~)K)5h0 z)5rjY8E4FSrF3FQ4CT(20fK>YQYP|UDML0u46Z`d6=VTwKrnbyk}g_lggcgSK z;vG_g#x_R*v6tPTRCzVF0hQKU;7;Rom?hTn>$JK~`;hxSGA;~jw?c-{ExCfX;LX)T k4BiCOfwO_W{$YL}p4nA59Z^iSo&W#<07*qoM6N<$g6~^{X#fBK delta 311 zcmV-70m%OU0^tIXB$1O6e+h6%S#tmY3ljhU3ljkVnw%H_000McNliru-vI><9R$~% zSl0jm0PaadK~y-)?b0!B!!Qg5P^lU`@&@%q)bLyd3|K{njy*!J;+#NNV5en3K!f9!u0-Vd_^60+pC z;(+|oKq^+r`;ru-I_G(g1H-;dKu%bJVvG#mg%n1GKs$rq!Um);J;x~dP^yAWZZJrG zEwe&@0_*Zp7CS*JFkm~;?w}nKL*MTBZ|fMKbvX?-7<4v=Kh`#Sbdo!pG_2taf@KM7 zd;@Q3J6_KFc~XGQEeaL-&5|2nvQ@Ss1)Ma@C5)-3$BVtW{s3tlvfrAWX7K<3002ov JPDHLkV1oH$gJS>y diff --git a/radio/src/bitmaps/128x64/splash_frsky.png b/radio/src/bitmaps/128x64/splash_frsky.png deleted file mode 100644 index 84b3cf5e4a324b78ee941041ebdc6afef7ffd3f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 495 zcmVWFU8GbZ8()Nlj2>E@cM*00C1;L_t(I%hl5{OT$1E z2k>{MkO+mV=u(j0pl*V=h(qXEa43$&$+44ugAC$bQRt}PqDv>gfqsBUR%yRMImj2t z7%|@Yu8EMIyU&$8N6}m zw4~b(>`dx2jfBGqF_{=;LWU)@=hWolR*5*OV9K$=mqKP`7{MKvpecxVWp~PE5(M6a zAd(nJ0SudrBt-;#1{OGW8IyeHz%dxl6bJ+XbK`}DTu2LJ3ps#~0KdR+2+eGw2=og9 zlcQ=8u`o2n7R;6@viJy^B^AV;1%jaM>j95FT$p7#2K_Q#+%^^dE=b#QUM{xs}81iNn~bi3E>=J2@{oW7KBw12s|^*ZXDT~*M4 lek*t+L1UvnXKls)zaLqsn*T_vxc~qF002ovPDHLkV1kC+(UJfF diff --git a/radio/src/bitmaps/212x64/splash.png b/radio/src/bitmaps/212x64/splash.png index 43cd387dc7b790ab437796d6464fd402a305adfa..9eac084cd8658fe619bcd385467743f6094986e7 100644 GIT binary patch delta 831 zcmV-F1Hk;763PaU7=Hu<0001x2Sk1V001j=MObu0a%Ew3X>V>IRB3Hx08@2tAT}UM zb#5RsFfuV9GBY|eF*-CdAT2O8FfgL`^P>O&00(qQO+^Rg1_uQa8G@eoZ~y=R32;bR za{vGe@Bjb`@Bu=sG?)MY00d`2O+f$vv5yP_xJZkMn>=N?+6G8&d$!~=jXn@zSh>(2oMmTST~OV00L%7L_t(|+U=IV zOCv!P$7ePP8oYqlUUjhkAc_!YBf{CFxjv{HBqF9c1i3;ukSnhd;i|yF{Ri7jU_kX>ao&DikGqYj2YQF5|&2F;u$@{TyhA}56CnqN-rz+I^e<(hY=1Z7p zkKLo`!QFElbWBs!)N_5Np9gKllchsI?NF45W(0TFzz)t#sI5E-S+y`h)shhxV}fEA zVD=fC`v&&f(y0^$acHEd)IT1yDe9B*#D02ranX55H;UWZuF{n6K1?`r7g)ywbk#V&u zwO+-&B8TG8l#c(v^^qAhZ57_jt-?Z_QPfXdM1MX2Z}4blP1##?@_UO-Mp5|mNH(Wm z)@~K-m^zt%g1MSdR7*7_Z14LPg<&b)O@=AzNxi;xKn literal 2331 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 diff --git a/radio/src/bitmaps/212x64/splash_frsky.png b/radio/src/bitmaps/212x64/splash_frsky.png deleted file mode 100644 index 37c410f47d08e331a948edc53a19a4946bde7080..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1400 zcmV-;1&8{HP)7fFS{o6FW1LEbGNapo8}LKSyNZ>y3Z7 zgSvydgSvzISWt)WS(as4_Wkkr7lF#Ia_NVM#f53hFCnR6b@3y6{0frd=YO_jIG%K` ztv)}fSxU#l)A+Z`KR>9U2V)Fycsc-3H-8+Jt{Pz?Q+r9B1t8ZS9#?{@7wl=G)ZKzp zSC4De?`bfGzJE@zYIryRCVpo1JLzGPS&&MA>NBgKq!2=sBsBoth{}CtP@@smK~gk; zS5oNsi9to17de29k_sRw0+gRx{Uk|l)VLgw+R?l|IVj0NEeU9n0ybX&lsa&d2S%Uq zSI4R69B?DIu-+*AJys#fm6b3UuWq`vGldet5g8OGPz>t@~b3d(E zyz6+t3>5hd;?&lvcI&~CTJm7hn)J+Oek+Y$B@Lg}+c`0j7Ri3I-if=3`d!S508#{^ zEXl-HdDJ|rHC;dPWLl)8##7oq(YKd|ieH0jH+E(B;CB)b)s8IP#FVz#t%-R6GXq%U zS$;87-N;eQ#7{ix!XEx8`NBzZMZ4U1zF=@ndO2HJm?he5>PK~o^39FBU$bLI#(**4 zyyRj2j9N%MB?kD$O|h zjd-g#RlPFT*M-!s@7S^@8`pT->95~m2y}6h=xspF0%78HaNXLDw?V(y*Q;o7qFZdM z_vy`)Z%t5s0cxw07uU*BH%(JrET~aUH(Y9QcD2{dK!qJn$8!QY7Yin5cR}pSUo!Gm zp!TwX>H z{d^V8q5$aEP0}CBCAaG)?U|{4v-$d!>noQQd2%Q9wn@FCg~Rz0eM|oCbxm+_{8^= tgtime-200) { - secondSplash = true; - drawSecondSplash(); - } -#endif - #if defined(PCBSKY9X) if (curTime < get_tmr10ms()) { curTime += 10;