Merge pull request #7785 from kivaisan/fix_join_accept_failure_handling

0xc0170 · web-flow · commit 81f5decf8ffe · 2018-08-22T14:05:24.000+02:00
Lora: Fix join-response failure handling
diff --git a/features/lorawan/LoRaWANStack.cpp b/features/lorawan/LoRaWANStack.cpp
@@ -659,6 +659,7 @@ void LoRaWANStack::process_reception(const uint8_t *const payload, uint16_t size
     }
 
     if (!_loramac.nwk_joined()) {
+        _ready_for_rx = true;
         return;
     }
 
@@ -1181,7 +1182,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
`@@ -659,6 +659,7 @@ void LoRaWANStack::process_reception(const uint8_t *const payload, uint16_t size`
`659`	`659`	`}`
`660`	`660`
`661`	`661`	`if (!_loramac.nwk_joined()) {`
	`662`	`+ _ready_for_rx = true;`
`662`	`663`	`return;`
`663`	`664`	`}`
`664`	`665`
`@@ -1181,7 +1182,8 @@ void LoRaWANStack::process_joining_state(lorawan_status_t &op_status)`
`1181`	`1182`	`return;`
`1182`	`1183`	`}`
`1183`	`1184`
`1184`		`- if (_device_current_state == DEVICE_STATE_AWAITING_JOIN_ACCEPT) {`
	`1185`	`+ if (_device_current_state == DEVICE_STATE_AWAITING_JOIN_ACCEPT &&`
	`1186`	`+ _loramac.get_current_slot() != RX_SLOT_WIN_1) {`
`1185`	`1187`	`_device_current_state = DEVICE_STATE_JOINING;`
`1186`	`1188`	`// retry join`
`1187`	`1189`	`bool can_continue = _loramac.continue_joining_process();`