From 94f9eb7a35f998fd487bbeb3a59a546d54a53b09 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 5 Aug 2018 14:22:23 +0200
Subject: [PATCH] Unused FSPLASH option removed

---
 radio/src/datastructs.h              |  2 --
 radio/src/gui/128x64/radio_setup.cpp |  4 ++--
 radio/src/gui/212x64/radio_setup.cpp |  4 ++--
 radio/src/opentx.cpp                 | 11 +----------
 radio/src/opentx.h                   |  2 --
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index 348e413b0..44eb39f6a 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -612,8 +612,6 @@ PACK(struct TrainerData {
 
 #if defined(PCBHORUS)
   #define SPLASH_MODE uint8_t splashSpares:3
-#elif defined(FSPLASH)
-  #define SPLASH_MODE uint8_t splashMode:3
 #else
   #define SPLASH_MODE int8_t splashMode:3
 #endif
diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp
index a8c04a0e5..785df9271 100644
--- a/radio/src/gui/128x64/radio_setup.cpp
+++ b/radio/src/gui/128x64/radio_setup.cpp
@@ -36,7 +36,7 @@ const unsigned char sticks[]  = {
     value = editChoice(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \
   }
 
-#if defined(SPLASH) && !defined(FSPLASH)
+#if defined(SPLASH)
   #define CASE_SPLASH_PARAM(x) x,
 #else
   #define CASE_SPLASH_PARAM(x)
@@ -451,7 +451,7 @@ void menuRadioSetup(event_t event)
         break;
 #endif
 
-#if defined(SPLASH) && !defined(FSPLASH)
+#if defined(SPLASH)
       case ITEM_SETUP_DISABLE_SPLASH:
       {
         lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN);
diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp
index 3d3037905..cce07e5cf 100644
--- a/radio/src/gui/212x64/radio_setup.cpp
+++ b/radio/src/gui/212x64/radio_setup.cpp
@@ -36,7 +36,7 @@ const unsigned char sticks[]  = {
   value = editChoice(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \
 }
 
-#if defined(SPLASH) && !defined(FSPLASH)
+#if defined(SPLASH)
   #define CASE_SPLASH_PARAM(x) x,
 #else
   #define CASE_SPLASH_PARAM(x)
@@ -395,7 +395,7 @@ void menuRadioSetup(event_t event)
         break;
 #endif
 
-#if defined(SPLASH) && !defined(FSPLASH)
+#if defined(SPLASH)
       case ITEM_SETUP_DISABLE_SPLASH:
       {
         lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN);
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index b35fc0333..5e80c9f38 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -759,7 +759,7 @@ void doSplash()
     drawSplash();
 
 
-#if   defined(PCBSKY9X)
+#if defined(PCBSKY9X)
     tmr10ms_t curTime = get_tmr10ms() + 10;
     uint8_t contrast = 10;
     lcdSetRefVolt(contrast);
@@ -776,17 +776,8 @@ void doSplash()
 
       getADC();
 
-#if defined(FSPLASH)
-      // Splash is forced, we can't skip it
-      if (!(g_eeGeneral.splashMode & 0x04)) {
-#endif
-
       if (keyDown() || inputsMoved()) return;
 
-#if defined(FSPLASH)
-      }
-#endif
-
 #if defined(PWR_BUTTON_PRESS)
       uint32_t pwr_check = pwrCheck();
       if (pwr_check == e_power_off) {
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index b162975c6..daf616120 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -365,8 +365,6 @@ extern uint8_t channel_order(uint8_t x);
 
 #if defined(PCBHORUS)
   #define SPLASH_TIMEOUT               0 /* we use the splash duration to load stuff from the SD */
-#elif defined(FSPLASH)
-  #define SPLASH_TIMEOUT               (g_eeGeneral.splashMode == 0 ? 60000/*infinite=10mn*/ : ((4*100) * (g_eeGeneral.splashMode & 0x03)))
 #elif defined(PCBTARANIS)
   #define SPLASH_TIMEOUT               (g_eeGeneral.splashMode==-4 ? 1500 : (g_eeGeneral.splashMode<=0 ? (400-g_eeGeneral.splashMode*200) : (400-g_eeGeneral.splashMode*100)))
 #else