Merge pull request #6569 from kivaisan/LORAWAN_FEATURE_BRANCH

Lora: small fixes

Author: Cruz Monrreal

features/lorawan/LoRaWANStack.cpp

@@ -577,6 +577,7 @@ void LoRaWANStack::mcps_indication_handler(loramac_mcps_indication_t *mcps_indic
 {
     if (mcps_indication->status != LORAMAC_EVENT_INFO_STATUS_OK) {
         if (_callbacks.events) {
+            tr_error("RX_ERROR: mcps_indication status = %d", mcps_indication->status);
             const int ret = _queue->call(_callbacks.events, RX_ERROR);
             MBED_ASSERT(ret != 0);
             (void)ret;
@@ -658,6 +659,7 @@ void LoRaWANStack::mcps_indication_handler(loramac_mcps_indication_t *mcps_indic
                 // that we could retry a certain number of times if the uplink
                 // failed for some reason
                 if (_loramac.get_device_class() != CLASS_C && mcps_indication->fpending_status) {
+                    tr_debug("Pending bit set. Sending empty message to receive pending data...");
                     handle_tx(mcps_indication->port, NULL, 0, MSG_CONFIRMED_FLAG, true);
                 }
 
@@ -667,6 +669,7 @@ void LoRaWANStack::mcps_indication_handler(loramac_mcps_indication_t *mcps_indic
                 // but version 1.1.0 says that network SHALL not send any new
                 // confirmed messages until ack has been sent
                 if (_loramac.get_device_class() == CLASS_C && mcps_indication->type == MCPS_CONFIRMED) {
+                    tr_debug("Acknowledging confirmed message (class C)...");
                     handle_tx(mcps_indication->port, NULL, 0, MSG_CONFIRMED_FLAG, true);
                 }
             } else {

features/lorawan/lorastack/mac/LoRaMac.cpp

@@ -293,6 +293,7 @@ void LoRaMac::on_radio_rx_done(uint8_t *payload, uint16_t size, int16_t rssi,
     _mcps_indication.is_ack_recvd = false;
     _mcps_indication.dl_frame_counter = 0;
     _mcps_indication.type = MCPS_UNCONFIRMED;
+    _mcps_indication.status = LORAMAC_EVENT_INFO_STATUS_OK;
 
     if (_device_class != CLASS_C) {
         _lora_phy.put_radio_to_sleep();
@@ -1102,7 +1103,6 @@ lorawan_status_t LoRaMac::schedule_tx(void)
 {
     lorawan_time_t dutyCycleTimeOff = 0;
     channel_selection_params_t nextChan;
-    lorawan_status_t status = LORAWAN_STATUS_PARAMETER_INVALID;
 
     if (_params.sys_params.max_duty_cycle == 255) {
         return LORAWAN_STATUS_DEVICE_OFF;
@@ -1121,9 +1121,10 @@ lorawan_status_t LoRaMac::schedule_tx(void)
     nextChan.joined = _is_nwk_joined;
     nextChan.last_aggregate_tx_time = _params.timers.aggregated_last_tx_time;
 
-    status = _lora_phy.set_next_channel(&nextChan, &_params.channel,
-                                        &dutyCycleTimeOff,
-                                        &_params.timers.aggregated_timeoff);
+    lorawan_status_t status = _lora_phy.set_next_channel(&nextChan,
+                                                         &_params.channel,
+                                                         &dutyCycleTimeOff,
+                                                         &_params.timers.aggregated_timeoff);
     switch (status) {
         case LORAWAN_STATUS_NO_CHANNEL_FOUND:
         case LORAWAN_STATUS_NO_FREE_CHANNEL_FOUND: