Prevent hard-fault when no IO available for transponder.

This cleans up the transponder api too.
betaflight · Jan 16, 2017 · 3c29725 · 3c29725
1 parent b7caf6f
commit 3c29725
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/src/main/drivers/transponder_ir.c b/src/main/drivers/transponder_ir.c
@@ -39,7 +39,7 @@ uint8_t transponderIrDMABuffer[TRANSPONDER_DMA_BUFFER_SIZE];
 
 volatile uint8_t transponderIrDataTransferInProgress = 0;
 
-void transponderIrInit(void)
+bool transponderIrInit(void)
 {
     memset(&transponderIrDMABuffer, 0, TRANSPONDER_DMA_BUFFER_SIZE);
 
@@ -51,7 +51,13 @@ void transponderIrInit(void)
         }
     }
 
+    if (!ioTag) {
+        return false;
+    }
+
+
     transponderIrHardwareInit(ioTag);
+    return true;
 }
 
 bool isTransponderIrReady(void)

diff --git a/src/main/drivers/transponder_ir.h b/src/main/drivers/transponder_ir.h
@@ -30,7 +30,7 @@
 #define BIT_TOGGLE_1 78 // (156 / 2)
 #define BIT_TOGGLE_0 0
 
-void transponderIrInit();
+bool transponderIrInit();
 void transponderIrDisable(void);
 
 void transponderIrHardwareInit(ioTag_t ioTag);

diff --git a/src/main/drivers/transponder_ir_stm32f30x.c b/src/main/drivers/transponder_ir_stm32f30x.c
@@ -45,10 +45,6 @@ static void TRANSPONDER_DMA_IRQHandler(dmaChannelDescriptor_t* descriptor)
 
 void transponderIrHardwareInit(ioTag_t ioTag)
 {
-    if (!ioTag) {
-        return;
-    }
-
     TIM_TimeBaseInitTypeDef  TIM_TimeBaseStructure;
     TIM_OCInitTypeDef  TIM_OCInitStructure;
     DMA_InitTypeDef DMA_InitStructure;

diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
@@ -490,7 +490,6 @@ void init(void)
 #ifdef TRANSPONDER
     if (feature(FEATURE_TRANSPONDER)) {
         transponderInit(masterConfig.transponderData);
-        transponderEnable();
         transponderStartRepeating();
         systemState |= SYSTEM_STATE_TRANSPONDER_ENABLED;
     }

diff --git a/src/main/io/transponder_ir.c b/src/main/io/transponder_ir.c
@@ -75,19 +75,12 @@ void transponderUpdate(timeUs_t currentTimeUs)
 
 void transponderInit(uint8_t* transponderData)
 {
-    transponderInitialised = false;
-    transponderIrInit();
-    transponderIrUpdateData(transponderData);
-}
-
-void transponderEnable(void)
-{
-    transponderInitialised = true;
-}
+    transponderInitialised = transponderIrInit();
+    if (!transponderInitialised) {
+        return;
+    }
 
-void transponderDisable(void)
-{
-    transponderInitialised = false;
+    transponderIrUpdateData(transponderData);
 }
 
 void transponderStopRepeating(void)
@@ -97,11 +90,19 @@ void transponderStopRepeating(void)
 
 void transponderStartRepeating(void)
 {
+    if (!transponderInitialised) {
+        return;
+    }
+
     transponderRepeat = true;
 }
 
 void transponderUpdateData(uint8_t* transponderData)
 {
+    if (!transponderInitialised) {
+        return;
+    }
+
     transponderIrUpdateData(transponderData);
 }
 

diff --git a/src/main/io/transponder_ir.h b/src/main/io/transponder_ir.h
@@ -21,8 +21,6 @@
 
 void transponderInit(uint8_t* transponderCode);
 
-void transponderEnable(void);
-void transponderDisable(void);
 void transponderUpdate(timeUs_t currentTimeUs);
 void transponderUpdateData(uint8_t* transponderData);
 void transponderTransmitOnce(void);