From 2037f0d8b0eb68833701f5ed62afe2fa5936fa0f Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Mon, 10 Dec 2012 10:30:54 +0000
Subject: [PATCH] [stock / gruvin9x] FrSky and DSM2 serial mode [Sky9x]
 Bootloader mode on REVC

---
 src/board_sky9x.cpp |  6 +----
 src/board_sky9x.h   |  7 ++----
 src/eeprom_arm.cpp  | 16 ++++++++------
 src/eeprom_avr.cpp  |  6 +++--
 src/model_menus.cpp |  3 ---
 src/open9x.cpp      | 54 +++++++++++++--------------------------------
 src/open9x.h        |  1 -
 src/pulses_avr.cpp  | 12 ++++++++++
 8 files changed, 43 insertions(+), 62 deletions(-)

diff --git a/src/board_sky9x.cpp b/src/board_sky9x.cpp
index 0c676947f..c58b6a3a0 100644
--- a/src/board_sky9x.cpp
+++ b/src/board_sky9x.cpp
@@ -69,10 +69,6 @@ inline void init_soft_power()
 }
 #endif
 
-#if defined(REVC)
-bool bootloader_allowed = true;
-#endif
-
 uint32_t check_soft_power()
 {
 #ifdef SIMU
@@ -1267,7 +1263,7 @@ void end_bt_tx_interrupt()
   NVIC_DisableIRQ(UART1_IRQn) ;
 }
 
-void usb_mode()
+void usbBootloader()
 {
   // This might be replaced by a software reset
   // Any interrupts that have been enabled must be disabled here
diff --git a/src/board_sky9x.h b/src/board_sky9x.h
index e3e5b9ac3..9e7196249 100644
--- a/src/board_sky9x.h
+++ b/src/board_sky9x.h
@@ -100,12 +100,9 @@ extern uint16_t sessionTimer;
 #endif
 
 #if defined(REVC)
-extern bool bootloader_allowed;
-#define SKIP_INIT() (check_soft_power() == e_power_off || (bootloader_allowed && usbPlugged()))
-#define BOOTLOADER_REQ() (bootloader_allowed && usbPlugged())
+#define BOOTLOADER_REQUEST() (usbPlugged())
 #else
-#define SKIP_INIT() (check_soft_power() >= e_power_usb)
-#define BOOTLOADER_REQ() (check_soft_power() == e_power_usb)
+#define BOOTLOADER_REQUEST() (check_soft_power() == e_power_usb)
 #endif
 
 #define SLAVE_MODE() (check_soft_power() == e_power_trainer)
diff --git a/src/eeprom_arm.cpp b/src/eeprom_arm.cpp
index 96fccf6b1..226de7438 100644
--- a/src/eeprom_arm.cpp
+++ b/src/eeprom_arm.cpp
@@ -500,8 +500,6 @@ void eeLoadModel(uint8_t id)
     activeFunctions = 0;
     activeFunctionSwitches = 0;
 
-    resetProto();
-
     for (uint8_t i=0; i<MAX_TIMERS; i++) {
       if (g_model.timers[i].remanent) {
         s_timerVal[i] = g_model.timers[i].value;
@@ -511,6 +509,10 @@ void eeLoadModel(uint8_t id)
     resumeMixerCalculations();
     // TODO pulses should be started after mixer calculations ...
 
+#if defined(FRSKY)
+    FRSKY_setModelAlarms();
+#endif
+
     LOAD_MODEL_BITMAP();
   }
 }
@@ -542,7 +544,11 @@ void eeReadAll()
 
     modelDefault(0);
 
-    if (!SKIP_INIT()) {
+    if (check_soft_power()==e_power_off) {
+      // we don't want to store anything
+      s_eeDirtyMsk = 0;
+    }
+    else {
       /* we remove all models */
       for (uint32_t i=0; i<MAX_MODELS; i++)
         eeDeleteModel(i);
@@ -550,10 +556,6 @@ void eeReadAll()
       STORE_GENERALVARS;
       STORE_MODELVARS;
     }
-    else {
-      // we don't want to store anything
-      s_eeDirtyMsk = 0;
-    }
   }
   else
   {
diff --git a/src/eeprom_avr.cpp b/src/eeprom_avr.cpp
index e1c31d74c..aebb067b7 100644
--- a/src/eeprom_avr.cpp
+++ b/src/eeprom_avr.cpp
@@ -896,8 +896,6 @@ void eeLoadModel(uint8_t id)
     activeFunctions = 0;
     activeFunctionSwitches = 0;
 
-    resetProto();
-
 #if defined(PCBGRUVIN9X)
     for (uint8_t i=0; i<MAX_TIMERS; i++) {
       if (g_model.timers[i].remanent) {
@@ -905,6 +903,10 @@ void eeLoadModel(uint8_t id)
       }
     }
 #endif
+
+#if defined(FRSKY)
+    FRSKY_setModelAlarms();
+#endif
   }
 }
 
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 70efbd0ee..fa949524e 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -834,9 +834,6 @@ void menuModelSetup(uint8_t event)
           switch (m_posHorz) {
             case 0:
               CHECK_INCDEC_MODELVAR(event, g_model.protocol, 0, PROTO_MAX-1);
-#if defined(DSM2_SERIAL)
-              if (checkIncDec_Ret) resetProto();
-#endif
               break;
             case 1:
 #if defined(DSM2)
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 473e995e6..33afc6d44 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -335,33 +335,6 @@ void modelDefault(uint8_t id)
   applyDefaultTemplate();
 }
 
-void resetProto()
-{
-#if defined(DSM2_SERIAL)
-  if (g_model.protocol == PROTO_DSM2) {
-    cli();
-#if defined(FRSKY)
-    DSM2_Init();
-#endif
-    sei();
-  }
-  else {
-    cli();
-#if defined(FRSKY)
-    FRSKY_Init();
-#else
-    DSM2_Done();
-#endif
-    sei();
-#if defined(FRSKY)
-    FRSKY_setModelAlarms();
-#endif
-  }
-#elif defined(FRSKY)
-  FRSKY_setModelAlarms();
-#endif
-}
-
 int16_t intpol(int16_t x, uint8_t idx) // -100, -75, -50, -25, 0 ,25 ,50, 75, 100
 {
   CurveInfo crv = curveinfo(idx);
@@ -1192,9 +1165,9 @@ void doSplash()
 #if defined(FSPLASH) || defined(XSPLASH)
       if (!(g_eeGeneral.splashMode & 0x04))
 #endif
-      if (keyDown() || (tsum!=inacSum)) return;  // wait for key release
+      if (keyDown() || tsum!=inacSum) return;  // wait for key release
 
-      if (SKIP_INIT()) return;
+      if (check_soft_power()==e_power_off) return;
 
 #if !defined(PCBSTD)
       if (curTime < get_tmr10ms()) {
@@ -1263,7 +1236,7 @@ void checkTHR()
 
       int16_t v = thrAnaIn(thrchn);
 
-      if (SKIP_INIT() || v<=lowLim || keyDown())
+      if (check_soft_power()==e_power_off || keyDown() || v<=lowLim)
         break;
 
       checkBacklight();
@@ -1307,7 +1280,7 @@ void checkSwitches()
       last_bad_switches = switches_states;
     }
 
-    if (keyDown() || SKIP_INIT()) return; // Usb on or power off
+    if (check_soft_power()==e_power_off || keyDown()) return; // Usb on or power off
 
     checkBacklight();
 
@@ -1325,7 +1298,7 @@ void alert(const pm_char * t, const pm_char *s MESSAGE_SOUND_ARG)
   {
     SIMU_SLEEP(1);
 
-    if (SKIP_INIT()) return;
+    if (check_soft_power() == e_power_off) return;
 
     if (keyDown()) return;  // wait for key release
 
@@ -3008,7 +2981,12 @@ ISR(TIMER_10MS_VECT, ISR_NOBLOCK) // 10ms timer
 
 #if defined(FRSKY)
   if (cnt10ms == 30) {
+#if defined(DSM2_SERIAL)
+    if (s_current_protocol != PROTO_DSM2)
+      check_frsky();
+#else
     check_frsky();
+#endif
   }
 #endif
 
@@ -3382,9 +3360,7 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
 
   startPulses();
 
-  if (!SKIP_INIT()) {
-    wdt_enable(WDTO_500MS);
-  }
+  wdt_enable(WDTO_500MS);
 }
 
 #if defined(PCBSKY9X)
@@ -3500,11 +3476,11 @@ int main(void)
 
   sei(); // interrupts needed for FRSKY_Init and eeReadAll.
 
-#if defined(FRSKY)
+#if defined(FRSKY) && !defined(DSM2_SERIAL)
   FRSKY_Init();
 #endif
 
-#if defined(DSM2_SERIAL)
+#if defined(DSM2_SERIAL) && !defined(FRSKY)
   DSM2_Init();
 #endif
 
@@ -3533,7 +3509,7 @@ int main(void)
 #endif
 
 #if defined(PCBSKY9X)
-  if (BOOTLOADER_REQ()) {
+  if (BOOTLOADER_REQUEST()) {
     soft_power_off(); // Only turn power off if necessary
 
 #if defined(HAPTIC)
@@ -3556,7 +3532,7 @@ int main(void)
     lcd_putcAtt( 72, 24, 'B', DBLSIZE ) ;
     refreshDisplay() ;
 
-    usb_mode();
+    usbBootloader();
   }
 
   CoInitOS();
diff --git a/src/open9x.h b/src/open9x.h
index 0dfc8c248..62ff59f21 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -1012,7 +1012,6 @@ uint16_t eeLoadModelName(uint8_t id, char *name);
 void eeLoadModel(uint8_t id);
 void generalDefault();
 void modelDefault(uint8_t id);
-void resetProto();
 
 #if defined(PCBSKY9X)
 inline int32_t calc100toRESX(register int8_t x)
diff --git a/src/pulses_avr.cpp b/src/pulses_avr.cpp
index 865aa3826..822a0adc1 100644
--- a/src/pulses_avr.cpp
+++ b/src/pulses_avr.cpp
@@ -741,6 +741,12 @@ void setupPulses()
 
   if (s_current_protocol != required_protocol) {
 
+#if defined(DSM2_SERIAL) && defined(FRSKY)
+    if (s_current_protocol == PROTO_DSM2) {
+      FRSKY_Init();
+    }
+#endif
+
     s_current_protocol = required_protocol;
 
     TCCR1B = 0;                           // Stop counter
@@ -824,6 +830,12 @@ void setupPulses()
         PORTB &= ~(1<<OUT_B_PPM);             // Hold PPM output low
         break ;
 
+#if defined(DSM2_SERIAL) && defined(FRSKY)
+      case PROTO_DSM2:
+        DSM2_Init();
+        // no break
+#endif
+
       default: // PPM and DSM2=SERIAL modes
         set_timer3_capture(); 
         OCR1A = 44000;                        // Next frame starts in 22ms -- DSM mode.