Fork of Semtech LoRaWAN stack

Fork of LoRaWAN-lib by canuck lehead

Files at this revision

API Documentation at this revision

Comitter:
Shaun Nelson
Date:
Tue Aug 15 17:09:12 2017 -0400
Branch:
class_b
Parent:
38:182ba91524e4
Child:
40:f7ce84dc9363
Commit message:
Fix to pend beacon acquisition callback until acquisition process finishes

Changed in this revision

LoRaMac.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/LoRaMac.cpp	Wed Aug 09 16:20:21 2017 -0400
+++ b/LoRaMac.cpp	Tue Aug 15 17:09:12 2017 -0400
@@ -1502,7 +1502,7 @@
             {
                 if( MlmeConfirmQueue[i].MlmeRequest == MLME_BEACON_ACQUISITION )
                 {
-                    if( LoRaMacClassBIsAcquisitionPending( ) == true )
+                    if( ( LoRaMacClassBIsAcquisitionPending( ) == true ) || ( LoRaMacClassBIsAcquisitionTimerSet() == true ) )
                     {
                         MlmeConfirmQueue[0].MlmeRequest = MLME_BEACON_ACQUISITION;
                         MlmeConfirmQueue[0].Status = MlmeConfirmQueue[i].Status;
@@ -1510,8 +1510,10 @@
                     }
                 }
                 j--;
+
                 MlmeConfirm.Status = MlmeConfirmQueue[i].Status;
                 MlmeConfirm.MlmeRequest = MlmeConfirmQueue[i].MlmeRequest;
+
                 LoRaMacPrimitives->MacMlmeConfirm( &MlmeConfirm );
             }
             MlmeConfirmQueueCnt = j;