Lora: Fix join-response failure handling

Kimmo Vaisanen · Kimmo Vaisanen · commit efeeb095c5a3 · 2018-08-13T16:11:33.000+03: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
@@ -651,6 +651,7 @@ void LoRaWANStack::process_reception(const uint8_t *const payload, uint16_t size
     }
 
     if (!_loramac.nwk_joined()) {
+        _ready_for_rx = true;
         return;
     }
 
@@ -1172,7 +1173,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
`@@ -651,6 +651,7 @@ void LoRaWANStack::process_reception(const uint8_t *const payload, uint16_t size`
`651`	`651`	`}`
`652`	`652`
`653`	`653`	`if (!_loramac.nwk_joined()) {`
	`654`	`+ _ready_for_rx = true;`
`654`	`655`	`return;`
`655`	`656`	`}`
`656`	`657`
`@@ -1172,7 +1173,8 @@ void LoRaWANStack::process_joining_state(lorawan_status_t &op_status)`
`1172`	`1173`	`return;`
`1173`	`1174`	`}`
`1174`	`1175`
`1175`		`- if (_device_current_state == DEVICE_STATE_AWAITING_JOIN_ACCEPT) {`
	`1176`	`+ if (_device_current_state == DEVICE_STATE_AWAITING_JOIN_ACCEPT &&`
	`1177`	`+ _loramac.get_current_slot() != RX_SLOT_WIN_1) {`
`1176`	`1178`	`_device_current_state = DEVICE_STATE_JOINING;`
`1177`	`1179`	`// retry join`
`1178`	`1180`	`bool can_continue = _loramac.continue_joining_process();`