From 99169b6a453c08c06e0aed55ceaeb0fe2798545c Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 14 Mar 2015 18:07:30 +0400
Subject: [PATCH] Save/restore previous module power state after SPORT upgrade

---
 radio/src/targets/taranis/board_taranis.h |  2 ++
 radio/src/telemetry/frsky_sport.cpp       | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h
index 417d4190d..e89827d90 100644
--- a/radio/src/targets/taranis/board_taranis.h
+++ b/radio/src/targets/taranis/board_taranis.h
@@ -177,6 +177,8 @@ uint32_t isBootloaderStart(const void * buffer);
 #define INTERNAL_MODULE_OFF()     GPIO_ResetBits(GPIO_INT_RF_PWR, PIN_INT_RF_PWR)
 #define EXTERNAL_MODULE_ON()      GPIO_SetBits(GPIO_EXT_RF_PWR, PIN_EXT_RF_PWR)
 #define EXTERNAL_MODULE_OFF()     GPIO_ResetBits(GPIO_EXT_RF_PWR, PIN_EXT_RF_PWR)
+#define INERNAL_MODULE_PWR()      (GPIO_ReadInputDataBit(GPIO_INT_RF_PWR, PIN_INT_RF_PWR) == Bit_SET)
+#define EXTERNAL_MODULE_PWR()     (GPIO_ReadInputDataBit(GPIO_EXT_RF_PWR, PIN_EXT_RF_PWR) == Bit_SET)
 void init_no_pulses(uint32_t port);
 void disable_no_pulses(uint32_t port);
 void init_ppm( uint32_t module_index );
diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index ff508d053..e853f8cea 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -123,6 +123,7 @@ enum SportUpdateState {
 
 uint8_t  sportUpdateState = SPORT_IDLE;
 uint32_t sportUpdateAddr = 0;
+bool intPwr, extPwr;
 
 void processSportUpdatePacket(uint8_t *packet)
 {
@@ -362,6 +363,8 @@ bool sportUpdatePowerOn(ModuleIndex module)
   sportUpdateState = SPORT_POWERUP_REQ;
 
 #if defined(PCBTARANIS)
+  intPwr = INERNAL_MODULE_PWR();
+  extPwr = EXTERNAL_MODULE_PWR();
   INTERNAL_MODULE_OFF();
   EXTERNAL_MODULE_OFF();
 #endif
@@ -484,12 +487,19 @@ void sportFirmwareUpdate(ModuleIndex module, const char *filename)
   if (result == false) {
     POPUP_WARNING("Firmware Update Error");
   }
-  sportUpdateState = SPORT_IDLE;
   
 #if defined(PCBTARANIS)
   INTERNAL_MODULE_OFF();
   EXTERNAL_MODULE_OFF();
+  
+  sportWaitState(SPORT_IDLE, 1000);
+
+  if (intPwr) 
+    INTERNAL_MODULE_ON();
+  if (extPwr)
+    EXTERNAL_MODULE_ON();
 #endif
+  sportUpdateState = SPORT_IDLE;
 }
 
 #endif