Fixed ABP join handling to be similar to OTAA join handling

Author: mluis1

src/mac/LoRaMac.c

@@ -78,19 +78,25 @@
  */
 #define ADR_ACK_COUNTER_MAX                         0xFFFFFFFF
 
+/*!
+ * Delay required to simulate an ABP join like an OTAA join
+ */
+#define ABP_JOIN_PENDING_DELAY_MS                   10
+
 /*!
  * LoRaMac internal states
  */
 enum eLoRaMacState
 {
-    LORAMAC_IDLE          = 0x00000000,
-    LORAMAC_STOPPED       = 0x00000001,
-    LORAMAC_TX_RUNNING    = 0x00000002,
-    LORAMAC_RX            = 0x00000004,
-    LORAMAC_ACK_RETRY     = 0x00000010,
-    LORAMAC_TX_DELAYED    = 0x00000020,
-    LORAMAC_TX_CONFIG     = 0x00000040,
-    LORAMAC_RX_ABORT      = 0x00000080,
+    LORAMAC_IDLE             = 0x00000000,
+    LORAMAC_STOPPED          = 0x00000001,
+    LORAMAC_TX_RUNNING       = 0x00000002,
+    LORAMAC_RX               = 0x00000004,
+    LORAMAC_ACK_RETRY        = 0x00000010,
+    LORAMAC_TX_DELAYED       = 0x00000020,
+    LORAMAC_TX_CONFIG        = 0x00000040,
+    LORAMAC_RX_ABORT         = 0x00000080,
+    LORAMAC_ABP_JOIN_PENDING = 0x00000100,
 };
 
 /*
@@ -252,6 +258,10 @@ typedef struct sLoRaMacCtx
      * Start time of the response timeout
      */
     TimerTime_t ResponseTimeoutStartTime;
+    /*
+     * Timer required to simulate an ABP join like an OTAA join
+     */
+    TimerEvent_t AbpJoinPendingTimer;
     /*
      * Buffer containing the MAC layer commands
      */
@@ -5198,10 +5208,41 @@ LoRaMacStatus_t LoRaMacMcChannelSetupRxParams( AddressIdentifier_t groupID, McRx
     return LORAMAC_STATUS_OK;
 }
 
+/*!
+ * \brief Function executed on AbpJoinPendingTimer timer event
+ */
+static void OnAbpJoinPendingTimerEvent( void *context )
+{
+    MacCtx.MacState &= ~LORAMAC_ABP_JOIN_PENDING;
+    MacCtx.MacFlags.Bits.MacDone = 1;
+    OnMacProcessNotify( );
+}
+
+/*!
+ * \brief Start ABP join simulation
+ */
+static void AbpJoinPendingStart( void )
+{
+    static bool initialized = false;
+
+    if( initialized == false )
+    {
+        initialized = true;
+        TimerInit( &MacCtx.AbpJoinPendingTimer, OnAbpJoinPendingTimerEvent );
+    }
+
+    MacCtx.MacState |= LORAMAC_ABP_JOIN_PENDING;
+
+    TimerStop( &MacCtx.AbpJoinPendingTimer );
+    TimerSetValue( &MacCtx.AbpJoinPendingTimer, ABP_JOIN_PENDING_DELAY_MS );
+    TimerStart( &MacCtx.AbpJoinPendingTimer );
+}
+
 LoRaMacStatus_t LoRaMacMlmeRequest( MlmeReq_t* mlmeRequest )
 {
     LoRaMacStatus_t status = LORAMAC_STATUS_SERVICE_UNKNOWN;
     MlmeConfirmQueue_t queueElement;
+    bool isAbpJoinPending = false;
     uint8_t macCmdPayload[2] = { 0x00, 0x00 };
 
     if( mlmeRequest == NULL )
@@ -5246,7 +5287,7 @@ LoRaMacStatus_t LoRaMacMlmeRequest( MlmeReq_t* mlmeRequest )
             {
                 ResetMacParameters( false );
 
-            Nvm.MacGroup1.ChannelsDatarate = RegionAlternateDr( Nvm.MacGroup2.Region, mlmeRequest->Req.Join.Datarate, ALTERNATE_DR );
+                Nvm.MacGroup1.ChannelsDatarate = RegionAlternateDr( Nvm.MacGroup2.Region, mlmeRequest->Req.Join.Datarate, ALTERNATE_DR );
 
                 queueElement.Status = LORAMAC_EVENT_INFO_STATUS_JOIN_FAIL;
 
@@ -5271,8 +5312,7 @@ LoRaMacStatus_t LoRaMacMlmeRequest( MlmeReq_t* mlmeRequest )
                 Nvm.MacGroup2.NetworkActivation = mlmeRequest->Req.Join.NetworkActivation;
                 queueElement.Status = LORAMAC_EVENT_INFO_STATUS_OK;
                 queueElement.ReadyToHandle = true;
-                OnMacProcessNotify( );
-                MacCtx.MacFlags.Bits.MacDone = 1;
+                isAbpJoinPending = true;
                 status = LORAMAC_STATUS_OK;
             }
             break;
@@ -5393,6 +5433,10 @@ LoRaMacStatus_t LoRaMacMlmeRequest( MlmeReq_t* mlmeRequest )
     else
     {
         LoRaMacConfirmQueueAdd( &queueElement );
+        if( isAbpJoinPending == true )
+        {
+            AbpJoinPendingStart( );
+        }
     }
     return status;
 }