ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

LoRa: reset_mac_parameters put to correct place

pull/6279/head
Antti Kauppila 2018-03-04 14:21:43 +02:00
parent d232d3bb52
commit 37371df968
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
features/lorawan/lorastack/mac/LoRaMac.cpp
View File

@ -1881,9 +1881,6 @@ lorawan_status_t LoRaMac::mlme_request( loramac_mlme_req_t *mlmeRequest )
if (LORAMAC_IDLE != _params.mac_state) { if (LORAMAC_IDLE != _params.mac_state) {
return LORAWAN_STATUS_BUSY; return LORAWAN_STATUS_BUSY;
} }
if (MLME_JOIN == mlmeRequest->type) {
reset_mac_parameters();
}
mlme.reset_confirmation(); mlme.reset_confirmation();
@ -1916,6 +1913,9 @@ lorawan_status_t LoRaMac::mlme_request( loramac_mlme_req_t *mlmeRequest )
} }
// Reset variable JoinRequestTrials // Reset variable JoinRequestTrials
_params.join_request_trial_counter = 0; _params.join_request_trial_counter = 0;
reset_mac_parameters();
_params.sys_params.channel_data_rate = _params.sys_params.channel_data_rate =
lora_phy->get_alternate_DR(_params.join_request_trial_counter + 1); lora_phy->get_alternate_DR(_params.join_request_trial_counter + 1);