modlora: Fix for class C downlink data in ABP mode

Author: oligauc

esp32/mods/modlora.c

@@ -967,6 +967,10 @@ static void TASK_LoRa (void *pvParameters) {
                 #if defined(FIPY) || defined(LOPY4)
                     xSemaphoreTake(xLoRaSigfoxSem, portMAX_DELAY);
                 #endif
+                    mibReq.Type = MIB_NETWORK_ACTIVATION;
+                    mibReq.Param.NetworkActivation = ACTIVATION_TYPE_OTAA;
+                    LoRaMacMibSetRequestConfirm( &mibReq );
+                    
                     TimerStart( &TxNextActReqTimer );
                     mlmeReq.Type = MLME_JOIN;
                     mlmeReq.Req.Join.DevEui = (uint8_t *)lora_obj.u.otaa.DevEui;
@@ -976,6 +980,10 @@ static void TASK_LoRa (void *pvParameters) {
                     mlmeReq.Req.Join.DR = (uint8_t) lora_obj.otaa_dr;
                     LoRaMacMlmeRequest( &mlmeReq );
                 } else {
+                    mibReq.Type = MIB_NETWORK_ACTIVATION;
+                    mibReq.Param.NetworkActivation = ACTIVATION_TYPE_ABP;
+                    LoRaMacMibSetRequestConfirm( &mibReq );
+                    
                     mibReq.Type = MIB_NET_ID;
                     mibReq.Param.NetID = lora_obj.net_id;
                     LoRaMacMibSetRequestConfirm( &mibReq );

lib/lora/mac/LoRaMac.c

@@ -120,6 +120,11 @@ static MulticastParams_t *MulticastChannels = NULL;
  */
 static DeviceClass_t LoRaMacDeviceClass;
 
+/*
+ * End-Device network activation
+ */
+static ActivationType_t NetworkActivation;
+
 /*!
  * Indicates if the node is connected to a private or public network
  */
@@ -1458,6 +1463,10 @@ static void OnRxWindow2TimerEvent( void )
     else
     {
         RxWindow2Config.RxContinuous = true;
+        
+        if (NetworkActivation == ACTIVATION_TYPE_ABP){
+            RxWindow2Config.Datarate = McpsIndication.RxDatarate;
+        }
     }
 
     if( RegionRxConfig( LoRaMacRegion, &RxWindow2Config, ( int8_t* )&McpsIndication.RxDatarate ) == true )
@@ -2301,6 +2310,7 @@ LoRaMacStatus_t LoRaMacInitialization( LoRaMacPrimitives_t *primitives, LoRaMacC
 
     LoRaMacDeviceClass = CLASS_A;
     LoRaMacState = LORAMAC_IDLE;
+    NetworkActivation = ACTIVATION_TYPE_NONE;
 
     JoinRequestTrials = 0;
     MaxJoinRequestTrials = 1;
@@ -2501,6 +2511,11 @@ LoRaMacStatus_t LoRaMacMibGetRequestConfirm( MibRequestConfirm_t *mibGet )
             mibGet->Param.Class = LoRaMacDeviceClass;
             break;
         }
+        case MIB_NETWORK_ACTIVATION:
+        {
+            mibGet->Param.NetworkActivation = NetworkActivation;
+            break;
+        }
         case MIB_NETWORK_JOINED:
         {
             mibGet->Param.IsNetworkJoined = IsLoRaMacNetworkJoined;
@@ -2705,6 +2720,18 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t *mibSet )
             }
             break;
         }
+        case MIB_NETWORK_ACTIVATION:
+        {
+            if( mibSet->Param.NetworkActivation != ACTIVATION_TYPE_OTAA )
+            {
+                NetworkActivation = mibSet->Param.NetworkActivation;
+            }
+            else
+            {
+                status = LORAMAC_STATUS_PARAMETER_INVALID;
+            }
+            break;
+        }
         case MIB_NETWORK_JOINED:
         {
             IsLoRaMacNetworkJoined = mibSet->Param.IsNetworkJoined;

lib/lora/mac/LoRaMac.h

@@ -142,6 +142,25 @@ typedef enum eDeviceClass
     CLASS_C,
 }DeviceClass_t;
 
+/*!
+ * End-Device activation type
+ */
+typedef enum eActivationType
+{
+    /*!
+     * None
+     */
+    ACTIVATION_TYPE_NONE = 0,
+    /*!
+     * Activation By Personalization (ACTIVATION_TYPE_ABP)
+     */
+    ACTIVATION_TYPE_ABP = 1,
+    /*!
+     * Over-The-Air Activation (ACTIVATION_TYPE_OTAA)
+     */
+    ACTIVATION_TYPE_OTAA = 2,
+}ActivationType_t;
+
 /*!
  * LoRaMAC channels parameters definition
  */
@@ -1111,6 +1130,7 @@ typedef struct sMlmeConfirm
  * Attribute                         | Get | Set
  * --------------------------------- | :-: | :-:
  * \ref MIB_DEVICE_CLASS             | YES | YES
+ * \ref MIB_NETWORK_ACTIVATION       | YES | YES
  * \ref MIB_NETWORK_JOINED           | YES | YES
  * \ref MIB_ADR                      | YES | YES
  * \ref MIB_NET_ID                   | YES | YES
@@ -1156,6 +1176,12 @@ typedef enum eMib
      * LoRaWAN Specification V1.0.2
      */
     MIB_DEVICE_CLASS,
+    /*!
+     * LoRaWAN Network End-Device Activation
+     *
+     * LoRaWAN Specification V1.0.2
+     */
+    MIB_NETWORK_ACTIVATION,
     /*!
      * LoRaWAN Network joined attribute
      *
@@ -1359,6 +1385,12 @@ typedef union uMibParam
      * Related MIB type: \ref MIB_DEVICE_CLASS
      */
     DeviceClass_t Class;
+    /*!
+     * LoRaWAN Network End-Device Activation ( ACTIVATION_TYPE_NONE, ACTIVATION_TYPE_ABP or OTTA )
+     *
+     * Related MIB type: \ref MIB_NETWORK_ACTIVATION
+     */
+    ActivationType_t NetworkActivation;
     /*!
      * LoRaWAN network joined attribute
      *