Issue 109 fixed

2012-08-28 10:39:39 +00:00
parent 0dac1386ec
commit 323329eeca
2 changed files with 21 additions and 4 deletions
@@ -3099,10 +3099,6 @@ uint16_t stack_free()

 inline void open9xInit(OPEN9X_INIT_ARGS)
 {
-#if defined(PCBARM)
-  sdInit();
-#endif
-
  eeReadAll();

 #if defined(PCBARM)
@@ -3113,6 +3109,18 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
  if (g_eeGeneral.backlightMode != e_backlight_mode_off) backlightOn(); // on Tx start turn the light on

  if (!UNEXPECTED_SHUTDOWN()) {
+#if defined(PCBARM)
+    lcd_clear();
+    refreshDisplay();
+    sdInit();
+#elif defined(PCBSTD && defined(VOICE) && !defined(SPLASH)
+    lcd_clear();
+    lcd_putsAtt(20, 28, PSTR("Open9x..."), DBLSIZE);
+    refreshDisplay();
+    tmr10ms_t tgtime = get_tmr10ms() + (2*100); /* 2 seconds */
+    while (tgtime != get_tmr10ms() && !keyDown());
+#endif
+
    doSplash();

 #if !defined(PCBARM)