Lora: Fix join-response failure handling

Kimmo Vaisanen · Cruz Monrreal II · commit 6ce5e1a1b6a8 · 2018-08-23T19:06:58.000-05:00
Thix commit fixes a bug where stack was resending join-accept already
after RX1 if received join-response was invalid.

Stack should wait for RX2 before resending the join-accept.
diff --git a/features/lorawan/LoRaWANStack.cpp b/features/lorawan/LoRaWANStack.cpp
@@ -654,6 +654,7 @@ void LoRaWANStack::process_reception(const uint8_t *const payload, uint16_t size
     }
 
     if (!_loramac.nwk_joined()) {
+        _ready_for_rx = true;
         return;
     }
 
@@ -1164,7 +1165,8 @@ void LoRaWANStack::process_joining_state(lorawan_status_t &op_status)
         return;
     }
 
-    if (_device_current_state == DEVICE_STATE_AWAITING_JOIN_ACCEPT) {
+    if (_device_current_state == DEVICE_STATE_AWAITING_JOIN_ACCEPT &&
+        _loramac.get_current_slot() != RX_SLOT_WIN_1) {
         _device_current_state = DEVICE_STATE_JOINING;
         // retry join
         bool can_continue = _loramac.continue_joining_process();

Original file line number	Diff line number	Diff line change
`@@ -654,6 +654,7 @@ void LoRaWANStack::process_reception(const uint8_t *const payload, uint16_t size`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`if (!_loramac.nwk_joined()) {`
	`657`	`+ _ready_for_rx = true;`
`657`	`658`	`return;`
`658`	`659`	`}`
`659`	`660`
`@@ -1164,7 +1165,8 @@ void LoRaWANStack::process_joining_state(lorawan_status_t &op_status)`
`1164`	`1165`	`return;`
`1165`	`1166`	`}`
`1166`	`1167`
`1167`		`- if (_device_current_state == DEVICE_STATE_AWAITING_JOIN_ACCEPT) {`
	`1168`	`+ if (_device_current_state == DEVICE_STATE_AWAITING_JOIN_ACCEPT &&`
	`1169`	`+ _loramac.get_current_slot() != RX_SLOT_WIN_1) {`
`1168`	`1170`	`_device_current_state = DEVICE_STATE_JOINING;`
`1169`	`1171`	`// retry join`
`1170`	`1172`	`bool can_continue = _loramac.continue_joining_process();`