From 7b5dfd7de5745e76de7ad215386b894accc727a1 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 11 Dec 2016 21:02:41 +0100
Subject: [PATCH] [X9D/X7D] FrSky splash is now an option

---
 radio/src/CMakeLists.txt                  |   6 ++++--
 radio/src/bitmaps/128x64/splash_frsky.png | Bin 0 -> 495 bytes
 radio/src/bitmaps/212x64/splash_frsky.png | Bin 0 -> 1400 bytes
 radio/src/gui/128x64/gui.h                |   1 +
 radio/src/gui/128x64/splash.cpp           |  16 ++++++++++++++++
 radio/src/gui/212x64/gui.h                |   1 +
 radio/src/gui/212x64/splash.cpp           |  15 +++++++++++++++
 radio/src/opentx.cpp                      |   8 ++++++++
 8 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 radio/src/bitmaps/128x64/splash_frsky.png
 create mode 100644 radio/src/bitmaps/212x64/splash_frsky.png

diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index a1836e0c4..e5ad559ef 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -8,7 +8,7 @@ option(FLIGHT_MODES "Flight Modes" ON)
 option(CURVES "Curves" ON)
 option(GVARS "Global variables" OFF)
 option(GUI "GUI enabled" ON)
-option(SPLASH "Splash enabled" ON)
+set(SPLASH "DEFAULT" CACHE STRING "Splash (DEFAULT/OFF/FRSKY)")
 set(PPM_UNIT "PERCENT_PREC1" CACHE STRING "PPM display unit (US/PERCENT_PREC1/PERCENT_PREC0)")
 option(PPM_CENTER_ADJUSTABLE "PPM center adjustable" ON)
 option(PPM_LIMITS_SYMETRICAL "PPM limits symetrical" OFF)
@@ -275,7 +275,9 @@ if(DANGEROUS_MODULE_FUNCTIONS)
   add_definitions(-DDANGEROUS_MODULE_FUNCTIONS)
 endif()
 
-if(SPLASH)
+if(SPLASH STREQUAL FRSKY)
+  add_definitions(-DSPLASH -DSPLASH_FRSKY)
+elseif(NOT SPLASH STREQUAL OFF)
   add_definitions(-DSPLASH)
 endif()
 
diff --git a/radio/src/bitmaps/128x64/splash_frsky.png b/radio/src/bitmaps/128x64/splash_frsky.png
new file mode 100644
index 0000000000000000000000000000000000000000..84b3cf5e4a324b78ee941041ebdc6afef7ffd3f1
GIT binary patch
literal 495
zcmV<L0TBL)P)<h;3K|Lk000e1NJLTq004jh002M%0{{R3=osxh00006P)t-s|Ns90
z0033O(|!N|010qNS#tmY3labT3lag+-G2N4000McNliru;0y~BEiYaAp}hbA03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()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<L@kN587{<#3G_GSJ+=0f3?Xcw4tTJGaz5UFxnKHV{)12>&$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$<u=1iK9`eFSDVtIO4-pV<n9K=i+#
zvnHI>p7#2K_Q#+%^^dE=b#QUM{xs}81iNn~bi3E>=J2@{oW7KBw12s|^*ZXDT~*M4
lek*t+L1UvnXKls)zaLqsn*T_vxc~qF002ovPDHLkV1kC+(UJfF

literal 0
HcmV?d00001

diff --git a/radio/src/bitmaps/212x64/splash_frsky.png b/radio/src/bitmaps/212x64/splash_frsky.png
new file mode 100644
index 0000000000000000000000000000000000000000..37c410f47d08e331a948edc53a19a4946bde7080
GIT binary patch
literal 1400
zcmV-;1&8{HP)<h;3K|Lk000e1NJLTq007hg002M;00000M?waX00009a7bBm000XT
z000XT0n*)m`~Uy|2XskIMF-#v3lk|PH%;t|000FSNkl<ZXx{Cb-F2fn6oo(Tx(#Sb
zPzy{6qy(k}ZV99WQUX(gQi5CpE<uzaO4#>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
zSI4R69<xl$&0vPS*sMc>B?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
z<m((`D9$ltHx+?m5|drAs#xoKyO7z{pyJNH=0a))?Y2X55>yyRj2j9N%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<tVf~sD4fn89GXWm-IoCP(9^)iGQLI^Q9zZ78cMk$XxUsz;r)*{^S`P(_!
zyFr<q_vJhDJHcQ%nss957H)LU{k<8J{yo?JpIYU$UCqy3<`?tpVRY<=)NeP(pR@J>
z{d^V8q5$aEP0}CBCAaG)?U|{4v-$d!>noQQd2%Q9wn@FCg~Rz0eM|oCbxm+_{<tzW
zyAEdgC7H~%MPfFSy=;D^Jl||#1~V9d;m|J+556ClSBoRACB6S974^j}o0-*)pqfhz
z*zLz%x0Xz|8H~ECnyvhLTXDxz$4mU?tE?cr@OELVoQ^w&cBS_l9*rFU2D{$i6BY(L
z47oWY|KhN|Yp`YV50B)Du1WsJ<h_Bxti0b7Q-9-KC$8E3GoCxBJE%LTJE%LTE5{+r
zR^Q7!WnTc)1JR_fFoxp*{M?A;{Q$%1YnuMJ{9)*qH$UPa`*rGAsX-p)l`7;=Yt#~b
zO0O(*Dxp!6l0uxv%OOqGJJ6|J_u6C1_@iXWvBh>8^<kiD8zEAwOn(|V1i?&Q<W7Ph
zVPh8*F?gv%eypbhc~rp3g}JBQMwLiZ61A{0=C^`!w9pdes4xvupoMD8gFR7!E)|ef
zDkGy52viDCt0PLyX@8{s(@0naV#Mn=OR58JsiY1%Ln8(7W;(YhksMJ9K@C9_9ZnLK
zsMyq<S|n8{j@n1A;3aAWTvF{Aw)=q}1}cIeN|9VJ&jg89B9{szwN#cUaur6Bnd@nc
zq(Fh0SWr@@pIidvB;dahl-f?tOHv!;{WRmG*aWEw8fQb@riVf+$;=yS$Gcuigt|JN
zYt??H-nkF?HtDuwcsRbReE+*MilVy#rhAci2XzN^<MBWLugJv=f?mA<0000<MNUMn
GLSTYq6`1Y-

literal 0
HcmV?d00001

diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h
index e7e2eb2b4..d15422ce9 100644
--- a/radio/src/gui/128x64/gui.h
+++ b/radio/src/gui/128x64/gui.h
@@ -441,6 +441,7 @@ void drawCheckBox(coord_t x, coord_t y, uint8_t value, LcdFlags attr);
 extern const pm_uchar sticks[] PROGMEM;
 
 void drawSplash();
+void drawSecondSplash();
 void drawScreenIndex(uint8_t index, uint8_t count, uint8_t attr);
 void drawStick(coord_t centrex, int16_t xval, int16_t yval);
 void drawPotsBars();
diff --git a/radio/src/gui/128x64/splash.cpp b/radio/src/gui/128x64/splash.cpp
index 25123da70..8cf1f02dc 100644
--- a/radio/src/gui/128x64/splash.cpp
+++ b/radio/src/gui/128x64/splash.cpp
@@ -67,3 +67,19 @@ void drawSplash()
   lcdRefresh();
 }
 #endif
+
+#if defined(SPLASH_FRSKY)
+const pm_uchar splashdata2[] PROGMEM = {
+  'S','F','S',0,
+  #include "bitmaps/128x64/splash_frsky.lbm"
+  'S','F','E',0 };
+
+const pm_uchar * const splash2_lbm = splashdata2+4;
+
+void drawSecondSplash()
+{
+  lcdClear();
+  lcd_img(0, 0, splash2_lbm, 0, 0);
+  lcdRefresh();
+}
+#endif
diff --git a/radio/src/gui/212x64/gui.h b/radio/src/gui/212x64/gui.h
index 4df3756bc..faaa52ecf 100644
--- a/radio/src/gui/212x64/gui.h
+++ b/radio/src/gui/212x64/gui.h
@@ -69,6 +69,7 @@ extern uint8_t noHighlightCounter;
 void drawCheckBox(coord_t x, coord_t y, uint8_t value, LcdFlags attr);
 void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr);
 void drawSplash();
+void drawSecondSplash();
 void drawScreenIndex(uint8_t index, uint8_t count, uint8_t attr);
 void drawVerticalScrollbar(coord_t x, coord_t y, coord_t h, uint16_t offset, uint16_t count, uint8_t visible);
 void displayMenuBar(const MenuItem * menu, int index);
diff --git a/radio/src/gui/212x64/splash.cpp b/radio/src/gui/212x64/splash.cpp
index 8fbdea114..61889ad7e 100644
--- a/radio/src/gui/212x64/splash.cpp
+++ b/radio/src/gui/212x64/splash.cpp
@@ -42,3 +42,18 @@ void drawSplash()
   lcdRefresh();
 }
 #endif
+
+#if defined(SPLASH_FRSKY)
+const pm_uchar splashdata2[] PROGMEM = {
+  'S','F','S',0,
+  #include "bitmaps/212x64/splash_frsky.lbm"
+  'S','F','E',0 };
+const pm_uchar * const splash2_lbm = splashdata2+4;
+
+void drawSecondSplash()
+{
+  lcdClear();
+  lcdDrawBitmap(0, 0, splash2_lbm);
+  lcdRefresh();
+}
+#endif
\ No newline at end of file
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index dae12cc31..fe445b9cb 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -964,6 +964,14 @@ void doSplash()
       }
 #endif
 
+#if defined(SPLASH_FRSKY)
+      static uint8_t secondSplash = false;
+      if (!secondSplash && get_tmr10ms() >= tgtime-200) {
+        secondSplash = true;
+        drawSecondSplash();
+      }
+#endif
+            
 #if defined(PCBSKY9X)
       if (curTime < get_tmr10ms()) {
         curTime += 10;