From 50816ba01b123e653df14b7a0565e50dbe4140ee Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Sun, 15 Jan 2012 20:59:56 +0000
Subject: [PATCH] SPLASH is now a compile option

---
 src/Makefile          | 7 +++++++
 src/general_menus.cpp | 9 ++++++++-
 src/gruvin9x.cpp      | 8 ++++++++
 src/gruvin9x.h        | 3 +++
 src/simpgmspace.cpp   | 2 ++
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index 26a3059cd..941b5b418 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -74,6 +74,9 @@ USART1 = STD
 # Values = STD, MOD1
 PPMIN =  STD
 
+# SPLASH on START
+SPLASH = YES
+
 # BATT voltage algorithm. Values = BANDGAP, UNSTABLE_BANDGAP 
 BATT = BANDGAP
 
@@ -216,6 +219,10 @@ ifeq ($(NAVIGATION), POTS)
  CPPDEFS += -DNAVIGATION_POT1 -DNAVIGATION_POT2 -DNAVIGATION_POT3
 endif
 
+ifneq ($(SPLASH), NO)
+ CPPDEFS += -DSPLASH
+endif
+
 MODS = 
 
 ifeq ($(PCB), STD)
diff --git a/src/general_menus.cpp b/src/general_menus.cpp
index 3e27d4d74..fda04255d 100644
--- a/src/general_menus.cpp
+++ b/src/general_menus.cpp
@@ -58,8 +58,13 @@ MenuFuncP_PROGMEM APM menuTabDiag[] = {
 
 void menuProcSetup(uint8_t event)
 {
+#ifdef SPLASH
 #define COUNT_ITEMS 19
-#undef PARAM_OFS
+#else
+#define COUNT_ITEMS 18
+#endif
+
+#undef  PARAM_OFS
 #define PARAM_OFS   17*FW
 
   SIMPLE_MENU("RADIO SETUP", menuTabDiag, e_Setup, COUNT_ITEMS+1);
@@ -158,6 +163,7 @@ void menuProcSetup(uint8_t event)
     if((y+=FH)>7*FH) return;
   }subN++;
 
+#ifdef SPLASH
   if(s_pgOfs<subN) {
       uint8_t b = 1-g_eeGeneral.disableSplashScreen;
       lcd_puts_P(0, y,PSTR("Splash screen"));
@@ -169,6 +175,7 @@ void menuProcSetup(uint8_t event)
       }
       if((y+=FH)>7*FH) return;
   }subN++;
+#endif
 
   if(s_pgOfs<subN) {
       uint8_t b = 1-g_eeGeneral.disableThrottleWarning;
diff --git a/src/gruvin9x.cpp b/src/gruvin9x.cpp
index 327a50689..bfe66a604 100644
--- a/src/gruvin9x.cpp
+++ b/src/gruvin9x.cpp
@@ -21,9 +21,11 @@
 
 #include "gruvin9x.h"
 
+#ifdef SPLASH
 prog_uchar APM spsMarker[] = { "SPS" };
 #include "s9xsplash.lbm"
 prog_uchar APM speMarker[] = { "SPE" };
+#endif
 
 #include "menus.h"
 
@@ -503,6 +505,7 @@ void clearKeyEvents()
     putEvent(0);
 }
 
+#ifdef SPLASH
 void doSplash()
 {
     if(!g_eeGeneral.disableSplashScreen)
@@ -550,6 +553,7 @@ void doSplash()
       }
     }
 }
+#endif
 
 void checkLowEEPROM()
 {
@@ -2284,7 +2288,11 @@ int main(void)
 #else
   if (~MCUCSR & (1 << WDRF)) {
 #endif
+
+#ifdef SPLASH
     doSplash();
+#endif
+
     checkLowEEPROM();
 
     getADC_single();
diff --git a/src/gruvin9x.h b/src/gruvin9x.h
index c7125fee8..d85019ceb 100644
--- a/src/gruvin9x.h
+++ b/src/gruvin9x.h
@@ -514,7 +514,10 @@ extern int8_t s_traceCnt;
 uint16_t getTmr16KHz();
 uint16_t stack_free();
 
+#ifdef SPLASH
 void doSplash();
+#endif
+
 void checkLowEEPROM();
 void checkTHR();
 void checkSwitches();
diff --git a/src/simpgmspace.cpp b/src/simpgmspace.cpp
index b879c8fc3..28cbe3b96 100644
--- a/src/simpgmspace.cpp
+++ b/src/simpgmspace.cpp
@@ -106,7 +106,9 @@ void *main_thread(void *)
     eeReadAll(); //load general setup and selected model
 
     if (main_thread_running == 1) {
+#ifdef SPLASH
       doSplash();
+#endif
       checkLowEEPROM();
       checkTHR();
       checkSwitches();