Introduce a new status MAC_RX_ABORT. Reset MAC_TX_RUNNING only in OnMacStateCheckTimerEvent.

Daniel Jäckle · Daniel Jäckle · commit a184dd833e90 · 2016-04-29T16:39:44.000+02:00
diff --git a/src/mac/LoRaMac.c b/src/mac/LoRaMac.c
@@ -452,6 +452,7 @@ enum eLoRaMacState
     MAC_ACK_RETRY     = 0x00000008,
     MAC_TX_DELAYED    = 0x00000010,
     MAC_TX_CONFIG     = 0x00000020,
+    MAC_RX_ABORT      = 0x00000040,
 };
 
 /*!
@@ -880,7 +881,7 @@ static void OnRadioTxDone( void )
 
 static void PrepareRxDoneAbort( void )
 {
-    LoRaMacState &= ~MAC_TX_RUNNING;
+    LoRaMacState |= MAC_RX_ABORT;
 
     if( NodeAckRequested )
     {
@@ -1321,6 +1322,12 @@ static void OnMacStateCheckTimerEvent( void )
 
     if( LoRaMacFlags.Bits.MacDone == 1 )
     {
+        if( ( LoRaMacState & MAC_RX_ABORT ) == MAC_RX_ABORT )
+        {
+            LoRaMacState &= ~MAC_RX_ABORT;
+            LoRaMacState &= ~MAC_TX_RUNNING;
+        }
+
         if( ( LoRaMacFlags.Bits.MlmeReq == 1 ) || ( ( LoRaMacFlags.Bits.McpsReq == 1 ) ) )
         {
             if( ( McpsConfirm.Status == LORAMAC_EVENT_INFO_STATUS_TX_TIMEOUT ) ||

Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,7 @@ enum eLoRaMacState`
`452`	`452`	`MAC_ACK_RETRY = 0x00000008,`
`453`	`453`	`MAC_TX_DELAYED = 0x00000010,`
`454`	`454`	`MAC_TX_CONFIG = 0x00000020,`
	`455`	`+ MAC_RX_ABORT = 0x00000040,`
`455`	`456`	`};`
`456`	`457`
`457`	`458`	`/*!`
`@@ -880,7 +881,7 @@ static void OnRadioTxDone( void )`
`880`	`881`
`881`	`882`	`static void PrepareRxDoneAbort( void )`
`882`	`883`	`{`
`883`		`- LoRaMacState &= ~MAC_TX_RUNNING;`
	`884`	`+ LoRaMacState \|= MAC_RX_ABORT;`
`884`	`885`
`885`	`886`	`if( NodeAckRequested )`
`886`	`887`	`{`
`@@ -1321,6 +1322,12 @@ static void OnMacStateCheckTimerEvent( void )`
`1321`	`1322`
`1322`	`1323`	`if( LoRaMacFlags.Bits.MacDone == 1 )`
`1323`	`1324`	`{`
	`1325`	`+ if( ( LoRaMacState & MAC_RX_ABORT ) == MAC_RX_ABORT )`
	`1326`	`+ {`
	`1327`	`+ LoRaMacState &= ~MAC_RX_ABORT;`
	`1328`	`+ LoRaMacState &= ~MAC_TX_RUNNING;`
	`1329`	`+ }`
	`1330`	`+`
`1324`	`1331`	`if( ( LoRaMacFlags.Bits.MlmeReq == 1 ) \|\| ( ( LoRaMacFlags.Bits.McpsReq == 1 ) ) )`
`1325`	`1332`	`{`
`1326`	`1333`	`if( ( McpsConfirm.Status == LORAMAC_EVENT_INFO_STATUS_TX_TIMEOUT ) \|\|`