esp32: Merge LoRaWAN fixes from master.

Author: Daniel Campora

esp32/mods/modlora.c

@@ -267,7 +267,8 @@ static TimerEvent_t TxNextActReqTimer;
 static nvs_handle modlora_nvs_handle;
 static const char *modlora_nvs_data_key[E_LORA_NVS_NUM_KEYS] = { "JOINED", "UPLNK", "DWLNK", "DEVADDR",
                                                                  "NWSKEY", "APPSKEY", "NETID", "ADRACK",
-                                                                 "MACPARAMS", "CHANNELS", "SRVACK" };
+                                                                 "MACPARAMS", "CHANNELS", "SRVACK", "MACNXTTX",
+                                                                 "MACBUFIDX", "MACRPTIDX", "MACBUF", "MACRPTBUF" };
 
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
@@ -785,6 +786,32 @@ static void TASK_LoRa (void *pvParameters) {
                                     *ack_req = false;
                                 }
 
+                                uint32_t mac_cmd_next_tx;
+                                modlora_nvs_get_uint(E_LORA_NVS_MAC_NXT_TX, (uint32_t *)&mac_cmd_next_tx);
+                                bool *next_tx = LoRaMacGetMacCmdNextTx();
+                                if (mac_cmd_next_tx) {
+                                    *next_tx = true;
+                                } else {
+                                    *next_tx = false;
+                                }
+
+                                uint32_t mac_cmd_buffer_idx;
+                                modlora_nvs_get_uint(E_LORA_NVS_MAC_CMD_BUF_IDX, (uint32_t *)&mac_cmd_buffer_idx);
+                                uint8_t *buffer_idx = LoRaMacGetMacCmdBufferIndex();
+                                *buffer_idx = mac_cmd_buffer_idx;
+
+                                modlora_nvs_get_uint(E_LORA_NVS_MAC_CMD_BUF_RPT_IDX, (uint32_t *)&mac_cmd_buffer_idx);
+                                buffer_idx = LoRaMacGetMacCmdBufferRepeatIndex();
+                                *buffer_idx = mac_cmd_buffer_idx;
+
+                                // write the buffered MAC commads directly from NVRAM
+                                length = 15;
+                                modlora_nvs_get_blob(E_LORA_NVS_ELE_MAC_BUF, (void *)LoRaMacGetMacCmdBuffer(), &length);
+
+                                // write the buffered MAC commads to repeat directly from NVRAM
+                                length = 15;
+                                modlora_nvs_get_blob(E_LORA_NVS_ELE_MAC_RPT_BUF, (void *)LoRaMacGetMacCmdBufferRepeat(), &length);
+
                                 lora_obj.activation = E_LORA_ACTIVATION_ABP;
                                 lora_obj.state = E_LORA_STATE_JOIN;
                                 // clear the joined flag until the nvram_save method is called again

esp32/mods/modlora.h

@@ -51,6 +51,11 @@ typedef enum {
     E_LORA_NVS_ELE_MAC_PARAMS,
     E_LORA_NVS_ELE_CHANNELS,
     E_LORA_NVS_ELE_ACK_REQ,
+    E_LORA_NVS_MAC_NXT_TX,
+    E_LORA_NVS_MAC_CMD_BUF_IDX,
+    E_LORA_NVS_MAC_CMD_BUF_RPT_IDX,
+    E_LORA_NVS_ELE_MAC_BUF,
+    E_LORA_NVS_ELE_MAC_RPT_BUF,
     E_LORA_NVS_NUM_KEYS 
 } e_lora_nvs_key_t;
 

lib/lora/mac/LoRaMac.c

@@ -4307,6 +4307,15 @@ void LoRaMacNvsSave( void )
     modlora_nvs_set_blob(E_LORA_NVS_ELE_MAC_PARAMS, &LoRaMacParams, sizeof(LoRaMacParams));
     modlora_nvs_set_blob(E_LORA_NVS_ELE_CHANNELS, Channels, sizeof(Channels));
 
+    modlora_nvs_set_uint(E_LORA_NVS_ELE_ACK_REQ, SrvAckRequested);
+
+    modlora_nvs_set_uint(E_LORA_NVS_MAC_NXT_TX, MacCommandsInNextTx);
+    modlora_nvs_set_uint(E_LORA_NVS_MAC_CMD_BUF_IDX, MacCommandsBufferIndex);
+    modlora_nvs_set_uint(E_LORA_NVS_MAC_CMD_BUF_RPT_IDX, MacCommandsBufferToRepeatIndex);
+
+    modlora_nvs_set_blob(E_LORA_NVS_ELE_MAC_BUF, MacCommandsBuffer, sizeof(MacCommandsBuffer));
+    modlora_nvs_set_blob(E_LORA_NVS_ELE_MAC_RPT_BUF, MacCommandsBufferToRepeat, sizeof(MacCommandsBufferToRepeat));
+
     modlora_nvs_set_uint(E_LORA_NVS_ELE_DWLINK, DownLinkCounter);
     modlora_nvs_set_uint(E_LORA_NVS_ELE_UPLINK, UpLinkCounter);
 
@@ -4317,7 +4326,6 @@ void LoRaMacNvsSave( void )
     modlora_nvs_set_uint(E_LORA_NVS_ELE_DEVADDR, LoRaMacDevAddr);
 
     modlora_nvs_set_uint(E_LORA_NVS_ELE_ADR_ACKS, AdrAckCounter);
-    modlora_nvs_set_uint(E_LORA_NVS_ELE_ACK_REQ, SrvAckRequested);
 }
 
 void LoRaMacTestSetDutyCycleOn( bool enable )
@@ -4336,3 +4344,23 @@ LoRaMacParams_t * LoRaMacGetMacParams(void) {
 bool * LoRaMacGetSrvAckRequested(void) {
     return &SrvAckRequested;
 }
+
+bool * LoRaMacGetMacCmdNextTx(void) {
+    return &MacCommandsInNextTx;
+}
+
+uint8_t * LoRaMacGetMacCmdBufferIndex(void) {
+    return &MacCommandsBufferIndex;
+}
+
+uint8_t * LoRaMacGetMacCmdBufferRepeatIndex(void) {
+    return &MacCommandsBufferToRepeatIndex;
+}
+
+uint8_t * LoRaMacGetMacCmdBuffer(void) {
+    return MacCommandsBuffer;
+}
+
+uint8_t * LoRaMacGetMacCmdBufferRepeat(void) {
+    return MacCommandsBufferToRepeat;
+}

lib/lora/mac/LoRaMac.h

@@ -1799,6 +1799,16 @@ LoRaMacParams_t * LoRaMacGetMacParams(void);
 
 bool * LoRaMacGetSrvAckRequested(void);
 
+bool * LoRaMacGetMacCmdNextTx(void);
+
+uint8_t * LoRaMacGetMacCmdBufferIndex(void);
+
+uint8_t * LoRaMacGetMacCmdBufferRepeatIndex(void);
+
+uint8_t * LoRaMacGetMacCmdBuffer(void);
+
+uint8_t * LoRaMacGetMacCmdBufferRepeat(void);
+
 /*! \} defgroup LORAMAC */
 
 #endif // __LORAMAC_H__