1.1.5 - Fix OTAA returning JOINED too early

arduino · Feb 22, 2018 · 4e1efcc · 4e1efcc
1 parent 0743599
commit 4e1efcc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Projects/Multi/Applications/LoRa/AT_Slave/inc/version.h b/Projects/Multi/Applications/LoRa/AT_Slave/inc/version.h
@@ -72,7 +72,7 @@ extern "C" {
 #define TEST_VERSION (uint32_t) 0x00000000  /*1 lsb is always 0 in releases   */
 #define LRWAN_VERSION  (uint32_t) 0x00001120  /*3 next hex is i_cube release*/
 #define VERSION   (uint32_t) (LORA_MAC_VERSION | LRWAN_VERSION | TEST_VERSION)
-#define AT_VERSION_STRING	"1.1.4"
+#define AT_VERSION_STRING	"1.1.5"
 #define AT_DEVICE_STRING	"ARD-078"
 
 /* Exported types ------------------------------------------------------------*/

diff --git a/Projects/Multi/Applications/LoRa/AT_Slave/src/lora.c b/Projects/Multi/Applications/LoRa/AT_Slave/src/lora.c
@@ -849,6 +849,7 @@ void lora_fsm( LoRaMacRegion_t region )
             LoRaMacMlmeRequest( &mlmeReq );
             NextTx = false;
         }
+        DeviceState = DEVICE_STATE_SLEEP;
       }
       else
       {
@@ -871,9 +872,10 @@ void lora_fsm( LoRaMacRegion_t region )
         mibReq.Type = MIB_NETWORK_JOINED;
         mibReq.Param.IsNetworkJoined = true;
         LoRaMacMibSetRequestConfirm( &mibReq );
+
+        DeviceState = DEVICE_STATE_JOINED;
       }
-
-      DeviceState = DEVICE_STATE_JOINED;
+
       break;
     }
     case DEVICE_STATE_JOINED: