From d685fd86bde10838100963c768ed464244b5bfae Mon Sep 17 00:00:00 2001 From: Daniel Jaeckle Date: Mon, 8 Jul 2019 13:39:08 +0200 Subject: [PATCH] Update sample applications to store the DevEui and the JoinEui via MIB --- src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c | 14 ++++++++++---- src/apps/LoRaMac/classA/NAMote72/main.c | 14 ++++++++++---- src/apps/LoRaMac/classA/NucleoL073/main.c | 14 ++++++++++---- src/apps/LoRaMac/classA/NucleoL152/main.c | 14 ++++++++++---- src/apps/LoRaMac/classA/NucleoL476/main.c | 14 ++++++++++---- src/apps/LoRaMac/classA/SAML21/main.c | 14 ++++++++++---- src/apps/LoRaMac/classA/SKiM880B/main.c | 14 ++++++++++---- src/apps/LoRaMac/classA/SKiM881AXL/main.c | 13 +++++++++---- src/apps/LoRaMac/classA/SKiM980A/main.c | 14 ++++++++++---- src/apps/LoRaMac/classB/B-L072Z-LRWAN1/main.c | 14 ++++++++++---- src/apps/LoRaMac/classB/NAMote72/main.c | 14 ++++++++++---- src/apps/LoRaMac/classB/NucleoL073/main.c | 14 ++++++++++---- src/apps/LoRaMac/classB/NucleoL152/main.c | 14 ++++++++++---- src/apps/LoRaMac/classB/NucleoL476/main.c | 14 ++++++++++---- src/apps/LoRaMac/classB/SAML21/main.c | 14 ++++++++++---- src/apps/LoRaMac/classB/SKiM880B/main.c | 14 ++++++++++---- src/apps/LoRaMac/classB/SKiM881AXL/main.c | 14 ++++++++++---- src/apps/LoRaMac/classB/SKiM980A/main.c | 14 ++++++++++---- src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c | 14 ++++++++++---- src/apps/LoRaMac/classC/NAMote72/main.c | 14 ++++++++++---- src/apps/LoRaMac/classC/NucleoL073/main.c | 14 ++++++++++---- src/apps/LoRaMac/classC/NucleoL152/main.c | 14 ++++++++++---- src/apps/LoRaMac/classC/NucleoL476/main.c | 14 ++++++++++---- src/apps/LoRaMac/classC/SAML21/main.c | 14 ++++++++++---- src/apps/LoRaMac/classC/SKiM880B/main.c | 14 ++++++++++---- src/apps/LoRaMac/classC/SKiM881AXL/main.c | 14 ++++++++++---- src/apps/LoRaMac/classC/SKiM980A/main.c | 14 ++++++++++---- src/apps/LoRaMac/common/LmHandler/LmHandler.c | 10 ++++++++-- 28 files changed, 277 insertions(+), 110 deletions(-) diff --git a/src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c b/src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c index 0800ebbf9..3ac0abc1f 100644 --- a/src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c +++ b/src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c @@ -85,8 +85,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -327,8 +325,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -938,6 +934,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1008,6 +1006,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classA/NAMote72/main.c b/src/apps/LoRaMac/classA/NAMote72/main.c index ef046d8d3..6e9a2b675 100644 --- a/src/apps/LoRaMac/classA/NAMote72/main.c +++ b/src/apps/LoRaMac/classA/NAMote72/main.c @@ -88,8 +88,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -330,8 +328,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1031,6 +1027,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1101,6 +1099,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classA/NucleoL073/main.c b/src/apps/LoRaMac/classA/NucleoL073/main.c index 598075ca0..8952adf20 100644 --- a/src/apps/LoRaMac/classA/NucleoL073/main.c +++ b/src/apps/LoRaMac/classA/NucleoL073/main.c @@ -85,8 +85,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -326,8 +324,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -936,6 +932,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1006,6 +1004,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classA/NucleoL152/main.c b/src/apps/LoRaMac/classA/NucleoL152/main.c index 0ae0301d4..360d87e0f 100644 --- a/src/apps/LoRaMac/classA/NucleoL152/main.c +++ b/src/apps/LoRaMac/classA/NucleoL152/main.c @@ -85,8 +85,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -326,8 +324,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -936,6 +932,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1006,6 +1004,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classA/NucleoL476/main.c b/src/apps/LoRaMac/classA/NucleoL476/main.c index 5d2930378..cd4ad03a7 100644 --- a/src/apps/LoRaMac/classA/NucleoL476/main.c +++ b/src/apps/LoRaMac/classA/NucleoL476/main.c @@ -85,8 +85,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -326,8 +324,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -936,6 +932,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1006,6 +1004,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classA/SAML21/main.c b/src/apps/LoRaMac/classA/SAML21/main.c index 3ba09ebb7..eef40c1ee 100644 --- a/src/apps/LoRaMac/classA/SAML21/main.c +++ b/src/apps/LoRaMac/classA/SAML21/main.c @@ -92,8 +92,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -332,8 +330,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -942,6 +938,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1014,6 +1012,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classA/SKiM880B/main.c b/src/apps/LoRaMac/classA/SKiM880B/main.c index 8ad7cc15b..046b295c9 100644 --- a/src/apps/LoRaMac/classA/SKiM880B/main.c +++ b/src/apps/LoRaMac/classA/SKiM880B/main.c @@ -87,8 +87,6 @@ */ #define LORAWAN_APP_PORT 3 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -329,8 +327,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -952,6 +948,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1022,6 +1020,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classA/SKiM881AXL/main.c b/src/apps/LoRaMac/classA/SKiM881AXL/main.c index 5416c101d..5f500563c 100644 --- a/src/apps/LoRaMac/classA/SKiM881AXL/main.c +++ b/src/apps/LoRaMac/classA/SKiM881AXL/main.c @@ -87,8 +87,6 @@ */ #define LORAWAN_APP_PORT 3 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -329,8 +327,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -952,6 +948,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1021,6 +1019,13 @@ int main( void ) { BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h diff --git a/src/apps/LoRaMac/classA/SKiM980A/main.c b/src/apps/LoRaMac/classA/SKiM980A/main.c index 551c13c38..6bf3fa007 100644 --- a/src/apps/LoRaMac/classA/SKiM980A/main.c +++ b/src/apps/LoRaMac/classA/SKiM980A/main.c @@ -87,8 +87,6 @@ */ #define LORAWAN_APP_PORT 3 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -329,8 +327,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -952,6 +948,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1022,6 +1020,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classB/B-L072Z-LRWAN1/main.c b/src/apps/LoRaMac/classB/B-L072Z-LRWAN1/main.c index 3d0bbce1b..cc92d9843 100644 --- a/src/apps/LoRaMac/classB/B-L072Z-LRWAN1/main.c +++ b/src/apps/LoRaMac/classB/B-L072Z-LRWAN1/main.c @@ -98,8 +98,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -356,8 +354,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1140,6 +1136,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1211,6 +1209,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classB/NAMote72/main.c b/src/apps/LoRaMac/classB/NAMote72/main.c index eaa3c60d2..5460788d5 100644 --- a/src/apps/LoRaMac/classB/NAMote72/main.c +++ b/src/apps/LoRaMac/classB/NAMote72/main.c @@ -101,8 +101,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -353,8 +351,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1217,6 +1213,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1288,6 +1286,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classB/NucleoL073/main.c b/src/apps/LoRaMac/classB/NucleoL073/main.c index ba783842a..1e15fae2c 100644 --- a/src/apps/LoRaMac/classB/NucleoL073/main.c +++ b/src/apps/LoRaMac/classB/NucleoL073/main.c @@ -98,8 +98,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -349,8 +347,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1122,6 +1118,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1193,6 +1191,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classB/NucleoL152/main.c b/src/apps/LoRaMac/classB/NucleoL152/main.c index 2f45abcd8..d39e805ca 100644 --- a/src/apps/LoRaMac/classB/NucleoL152/main.c +++ b/src/apps/LoRaMac/classB/NucleoL152/main.c @@ -98,8 +98,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -349,8 +347,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1122,6 +1118,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1193,6 +1191,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classB/NucleoL476/main.c b/src/apps/LoRaMac/classB/NucleoL476/main.c index 34510df77..57f3d04f2 100644 --- a/src/apps/LoRaMac/classB/NucleoL476/main.c +++ b/src/apps/LoRaMac/classB/NucleoL476/main.c @@ -98,8 +98,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -349,8 +347,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1122,6 +1118,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1193,6 +1191,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classB/SAML21/main.c b/src/apps/LoRaMac/classB/SAML21/main.c index 175ba9c82..e6a270908 100644 --- a/src/apps/LoRaMac/classB/SAML21/main.c +++ b/src/apps/LoRaMac/classB/SAML21/main.c @@ -105,8 +105,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -355,8 +353,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1128,6 +1124,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1201,6 +1199,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classB/SKiM880B/main.c b/src/apps/LoRaMac/classB/SKiM880B/main.c index 8e2857dbe..3905942b8 100644 --- a/src/apps/LoRaMac/classB/SKiM880B/main.c +++ b/src/apps/LoRaMac/classB/SKiM880B/main.c @@ -100,8 +100,6 @@ */ #define LORAWAN_APP_PORT 3 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -352,8 +350,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1138,6 +1134,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1209,6 +1207,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classB/SKiM881AXL/main.c b/src/apps/LoRaMac/classB/SKiM881AXL/main.c index f69549c8f..06b044bf1 100644 --- a/src/apps/LoRaMac/classB/SKiM881AXL/main.c +++ b/src/apps/LoRaMac/classB/SKiM881AXL/main.c @@ -100,8 +100,6 @@ */ #define LORAWAN_APP_PORT 3 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -352,8 +350,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1138,6 +1134,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1209,6 +1207,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classB/SKiM980A/main.c b/src/apps/LoRaMac/classB/SKiM980A/main.c index cdff6d016..ef903e42a 100644 --- a/src/apps/LoRaMac/classB/SKiM980A/main.c +++ b/src/apps/LoRaMac/classB/SKiM980A/main.c @@ -100,8 +100,6 @@ */ #define LORAWAN_APP_PORT 3 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -352,8 +350,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1138,6 +1134,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1209,6 +1207,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c b/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c index f5ad0dd5a..dd4b66afa 100644 --- a/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c +++ b/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c @@ -85,8 +85,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -327,8 +325,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -938,6 +934,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1008,6 +1006,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classC/NAMote72/main.c b/src/apps/LoRaMac/classC/NAMote72/main.c index aec5bf726..61acee896 100644 --- a/src/apps/LoRaMac/classC/NAMote72/main.c +++ b/src/apps/LoRaMac/classC/NAMote72/main.c @@ -88,8 +88,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -330,8 +328,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -1031,6 +1027,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1101,6 +1099,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classC/NucleoL073/main.c b/src/apps/LoRaMac/classC/NucleoL073/main.c index e47796769..ea6815e50 100644 --- a/src/apps/LoRaMac/classC/NucleoL073/main.c +++ b/src/apps/LoRaMac/classC/NucleoL073/main.c @@ -85,8 +85,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -326,8 +324,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -936,6 +932,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1006,6 +1004,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classC/NucleoL152/main.c b/src/apps/LoRaMac/classC/NucleoL152/main.c index bf53bef28..509fa177a 100644 --- a/src/apps/LoRaMac/classC/NucleoL152/main.c +++ b/src/apps/LoRaMac/classC/NucleoL152/main.c @@ -85,8 +85,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -326,8 +324,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -936,6 +932,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1006,6 +1004,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classC/NucleoL476/main.c b/src/apps/LoRaMac/classC/NucleoL476/main.c index 350178d0f..d27647688 100644 --- a/src/apps/LoRaMac/classC/NucleoL476/main.c +++ b/src/apps/LoRaMac/classC/NucleoL476/main.c @@ -85,8 +85,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -326,8 +324,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -936,6 +932,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1006,6 +1004,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classC/SAML21/main.c b/src/apps/LoRaMac/classC/SAML21/main.c index 9a488bde6..1ed539d6c 100644 --- a/src/apps/LoRaMac/classC/SAML21/main.c +++ b/src/apps/LoRaMac/classC/SAML21/main.c @@ -92,8 +92,6 @@ */ #define LORAWAN_APP_PORT 2 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -332,8 +330,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -942,6 +938,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1014,6 +1012,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classC/SKiM880B/main.c b/src/apps/LoRaMac/classC/SKiM880B/main.c index f6f57da2f..ec7214928 100644 --- a/src/apps/LoRaMac/classC/SKiM880B/main.c +++ b/src/apps/LoRaMac/classC/SKiM880B/main.c @@ -87,8 +87,6 @@ */ #define LORAWAN_APP_PORT 3 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -329,8 +327,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -952,6 +948,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1022,6 +1020,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classC/SKiM881AXL/main.c b/src/apps/LoRaMac/classC/SKiM881AXL/main.c index b02a1c3bb..e81937422 100644 --- a/src/apps/LoRaMac/classC/SKiM881AXL/main.c +++ b/src/apps/LoRaMac/classC/SKiM881AXL/main.c @@ -87,8 +87,6 @@ */ #define LORAWAN_APP_PORT 3 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -329,8 +327,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -952,6 +948,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1022,6 +1020,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/classC/SKiM980A/main.c b/src/apps/LoRaMac/classC/SKiM980A/main.c index 38d4362f0..887b013d7 100644 --- a/src/apps/LoRaMac/classC/SKiM980A/main.c +++ b/src/apps/LoRaMac/classC/SKiM980A/main.c @@ -87,8 +87,6 @@ */ #define LORAWAN_APP_PORT 3 -static uint8_t DevEui[] = LORAWAN_DEVICE_EUI; -static uint8_t JoinEui[] = LORAWAN_JOIN_EUI; #if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x ) static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY; #else @@ -329,8 +327,6 @@ static void JoinNetwork( void ) LoRaMacStatus_t status; MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = DevEui; - mlmeReq.Req.Join.JoinEui = JoinEui; mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE; // Starts the join procedure @@ -952,6 +948,8 @@ int main( void ) LoRaMacCallback_t macCallbacks; MibRequestConfirm_t mibReq; LoRaMacStatus_t status; + uint8_t devEui[] = LORAWAN_DEVICE_EUI; + uint8_t joinEui[] = LORAWAN_JOIN_EUI; BoardInitMcu( ); BoardInitPeriph( ); @@ -1022,6 +1020,14 @@ int main( void ) BoardGetUniqueId( DevEui ); } + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = devEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = joinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) // Choose a random device address if not already defined in Commissioning.h if( DevAddr == 0 ) diff --git a/src/apps/LoRaMac/common/LmHandler/LmHandler.c b/src/apps/LoRaMac/common/LmHandler/LmHandler.c index 5f83d8e93..a8f4dfd6d 100644 --- a/src/apps/LoRaMac/common/LmHandler/LmHandler.c +++ b/src/apps/LoRaMac/common/LmHandler/LmHandler.c @@ -280,6 +280,14 @@ LmHandlerErrorStatus_t LmHandlerInit( LmHandlerCallbacks_t *handlerCallbacks, LmHandlerCallbacks->GetUniqueId( CommissioningParams.DevEui ); #endif + mibReq.Type = MIB_DEV_EUI; + mibReq.Param.DevEui = CommissioningParams.DevEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + + mibReq.Type = MIB_JOIN_EUI; + mibReq.Param.JoinEui = CommissioningParams.JoinEui; + LoRaMacMibSetRequestConfirm( &mibReq ); + #if( OVER_THE_AIR_ACTIVATION == 0 ) #if( STATIC_DEVICE_ADDRESS != 1 ) @@ -395,8 +403,6 @@ static void LmHandlerJoinRequest( bool isOtaa ) MlmeReq_t mlmeReq; mlmeReq.Type = MLME_JOIN; - mlmeReq.Req.Join.DevEui = CommissioningParams.DevEui; - mlmeReq.Req.Join.JoinEui = CommissioningParams.JoinEui; mlmeReq.Req.Join.Datarate = LmHandlerParams->TxDatarate; // Update commissioning parameters activation type variable. CommissioningParams.IsOtaaActivation = true;