fix check MLME_JOIN

Author: Bei-Ji-Quan

libraries/LoraWan102/src/loramac/LoRaMac.c

@@ -730,7 +730,7 @@ static void OnRadioTxDone( void )
     }
 
     // Verify if the last uplink was a join request
-    if ( ( LoRaMacFlags.Bits.MlmeReq == 1 ) && ( MlmeConfirm.MlmeRequest == MLME_JOIN ) ) {
+    if ( ( LoRaMacFlags.Bits.MlmeReq == 1 ) && ( LoRaMacConfirmQueueIsCmdActive( MLME_JOIN ) == true ) ) {
         LastTxIsJoinRequest = true;
     } else {
         LastTxIsJoinRequest = false;
@@ -1461,7 +1461,7 @@ static void OnMacStateCheckTimerEvent( void )
 
         if ( ( NodeAckRequested == false ) && ( noTx == false ) ) {
             if ( ( LoRaMacFlags.Bits.MlmeReq == 1 ) || ( ( LoRaMacFlags.Bits.McpsReq == 1 ) ) ) {
-                if ( ( LoRaMacFlags.Bits.MlmeReq == 1 ) && ( MlmeConfirm.MlmeRequest == MLME_JOIN ) ) {
+                if ( ( LoRaMacFlags.Bits.MlmeReq == 1 ) && ( LoRaMacConfirmQueueIsCmdActive( MLME_JOIN ) == true ) ) {
                     // Procedure for the join request
                     MlmeConfirm.NbRetries = JoinRequestTrials;
 
@@ -1533,7 +1533,7 @@ static void OnMacStateCheckTimerEvent( void )
             }
 #ifdef CONFIG_LWAN
         } else {
-            if ( !(( LoRaMacFlags.Bits.MlmeReq == 1 ) && ( MlmeConfirm.MlmeRequest == MLME_JOIN )) )
+            if ( !(( LoRaMacFlags.Bits.MlmeReq == 1 ) && ( LoRaMacConfirmQueueIsCmdActive( MLME_JOIN ) == true )) )
                 lwan_dev_status_set(DEVICE_STATUS_SEND_PASS_WITHOUT_DL);
         }
 #else
@@ -1676,7 +1676,7 @@ static void OnTxDelayedTimerEvent( void )
     TimerStop( &TxDelayedTimer );
     LoRaMacState &= ~LORAMAC_TX_DELAYED;
 
-    if ( ( LoRaMacFlags.Bits.MlmeReq == 1 ) && ( MlmeConfirm.MlmeRequest == MLME_JOIN ) ) {
+    if ( ( LoRaMacFlags.Bits.MlmeReq == 1 ) && ( LoRaMacConfirmQueueIsCmdActive( MLME_JOIN ) == true ) ) {
         ResetMacParameters( );
 
         altDr.NbTrials = JoinRequestTrials + 1;