Issue #1060 - Fixed SX126x driver IrqFired variable management

mluis1 · mluis1 · commit 3a87be3ee3f2 · 2021-03-29T10:26:34.000+02:00
diff --git a/src/boards/NucleoL073/sx1261mbxbas-board.c b/src/boards/NucleoL073/sx1261mbxbas-board.c
@@ -330,6 +330,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )
     return true;
 }
 
+uint32_t SX126xGetDio1PinState( void )
+{
+    return GpioRead( &SX126x.DIO1 );
+}
+
 #if defined( USE_RADIO_DEBUG )
 static void SX126xDbgPinTxWrite( uint8_t state )
 {
diff --git a/src/boards/NucleoL073/sx1262mbxcas-board.c b/src/boards/NucleoL073/sx1262mbxcas-board.c
@@ -330,6 +330,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )
     return true;
 }
 
+uint32_t SX126xGetDio1PinState( void )
+{
+    return GpioRead( &SX126x.DIO1 );
+}
+
 #if defined( USE_RADIO_DEBUG )
 static void SX126xDbgPinTxWrite( uint8_t state )
 {
diff --git a/src/boards/NucleoL073/sx1262mbxdas-board.c b/src/boards/NucleoL073/sx1262mbxdas-board.c
@@ -337,6 +337,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )
     return true;
 }
 
+uint32_t SX126xGetDio1PinState( void )
+{
+    return GpioRead( &SX126x.DIO1 );
+}
+
 #if defined( USE_RADIO_DEBUG )
 static void SX126xDbgPinTxWrite( uint8_t state )
 {
diff --git a/src/boards/NucleoL152/sx1261mbxbas-board.c b/src/boards/NucleoL152/sx1261mbxbas-board.c
@@ -330,6 +330,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )
     return true;
 }
 
+uint32_t SX126xGetDio1PinState( void )
+{
+    return GpioRead( &SX126x.DIO1 );
+}
+
 #if defined( USE_RADIO_DEBUG )
 static void SX126xDbgPinTxWrite( uint8_t state )
 {
diff --git a/src/boards/NucleoL152/sx1262mbxcas-board.c b/src/boards/NucleoL152/sx1262mbxcas-board.c
@@ -330,6 +330,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )
     return true;
 }
 
+uint32_t SX126xGetDio1PinState( void )
+{
+    return GpioRead( &SX126x.DIO1 );
+}
+
 #if defined( USE_RADIO_DEBUG )
 static void SX126xDbgPinTxWrite( uint8_t state )
 {
diff --git a/src/boards/NucleoL152/sx1262mbxdas-board.c b/src/boards/NucleoL152/sx1262mbxdas-board.c
@@ -337,6 +337,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )
     return true;
 }
 
+uint32_t SX126xGetDio1PinState( void )
+{
+    return GpioRead( &SX126x.DIO1 );
+}
+
 #if defined( USE_RADIO_DEBUG )
 static void SX126xDbgPinTxWrite( uint8_t state )
 {
diff --git a/src/boards/NucleoL476/sx1261mbxbas-board.c b/src/boards/NucleoL476/sx1261mbxbas-board.c
@@ -330,6 +330,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )
     return true;
 }
 
+uint32_t SX126xGetDio1PinState( void )
+{
+    return GpioRead( &SX126x.DIO1 );
+}
+
 #if defined( USE_RADIO_DEBUG )
 static void SX126xDbgPinTxWrite( uint8_t state )
 {
diff --git a/src/boards/NucleoL476/sx1262mbxcas-board.c b/src/boards/NucleoL476/sx1262mbxcas-board.c
@@ -330,6 +330,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )
     return true;
 }
 
+uint32_t SX126xGetDio1PinState( void )
+{
+    return GpioRead( &SX126x.DIO1 );
+}
+
 #if defined( USE_RADIO_DEBUG )
 static void SX126xDbgPinTxWrite( uint8_t state )
 {
diff --git a/src/boards/NucleoL476/sx1262mbxdas-board.c b/src/boards/NucleoL476/sx1262mbxdas-board.c
@@ -337,6 +337,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )
     return true;
 }
 
+uint32_t SX126xGetDio1PinState( void )
+{
+    return GpioRead( &SX126x.DIO1 );
+}
+
 #if defined( USE_RADIO_DEBUG )
 static void SX126xDbgPinTxWrite( uint8_t state )
 {
diff --git a/src/boards/sx126x-board.h b/src/boards/sx126x-board.h
@@ -159,6 +159,13 @@ bool SX126xCheckRfFrequency( uint32_t frequency );
  */
 uint32_t SX126xGetBoardTcxoWakeupTime( void );
 
+/*!
+ * \brief Gets current state of DIO1 pin state.
+ *
+ * \retval state DIO1 pin current state.
+ */
+uint32_t SX126xGetDio1PinState( void );
+
 /*!
  * \brief Gets the current Radio OperationMode variable
  *
diff --git a/src/radio/sx126x/radio.c b/src/radio/sx126x/radio.c
@@ -1260,6 +1260,14 @@ void RadioIrqProcess( void )
         uint16_t irqRegs = SX126xGetIrqStatus( );
         SX126xClearIrqStatus( irqRegs );
 
+        // Check if DIO1 pin is High. If it is the case revert IrqFired to true
+        CRITICAL_SECTION_BEGIN( );
+        if( SX126xGetDio1PinState( ) == 1 )
+        {
+            IrqFired = true;
+        }
+        CRITICAL_SECTION_END( );
+
         if( ( irqRegs & IRQ_TX_DONE ) == IRQ_TX_DONE )
         {
             TimerStop( &TxTimeoutTimer );

Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )`
`330`	`330`	`return true;`
`331`	`331`	`}`
`332`	`332`
	`333`	`+uint32_t SX126xGetDio1PinState( void )`
	`334`	`+{`
	`335`	`+ return GpioRead( &SX126x.DIO1 );`
	`336`	`+}`
	`337`	`+`
`333`	`338`	`#if defined( USE_RADIO_DEBUG )`
`334`	`339`	`static void SX126xDbgPinTxWrite( uint8_t state )`
`335`	`340`	`{`
Original file line number	Diff line number	Diff line change
`@@ -337,6 +337,11 @@ bool SX126xCheckRfFrequency( uint32_t frequency )`
`337`	`337`	`return true;`
`338`	`338`	`}`
`339`	`339`
	`340`	`+uint32_t SX126xGetDio1PinState( void )`
	`341`	`+{`
	`342`	`+ return GpioRead( &SX126x.DIO1 );`
	`343`	`+}`
	`344`	`+`
`340`	`345`	`#if defined( USE_RADIO_DEBUG )`
`341`	`346`	`static void SX126xDbgPinTxWrite( uint8_t state )`
`342`	`347`	`{`