Skip to content

Commit d685fd8

Browse files
Daniel Jaecklemluis1
Daniel Jaeckle
authored and
mluis1
committed
Update sample applications to store the DevEui and the JoinEui via MIB
1 parent 3a290c0 commit d685fd8

File tree

28 files changed

+277
-110
lines changed

28 files changed

+277
-110
lines changed

‎src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@
8585
*/
8686
#define LORAWAN_APP_PORT 2
8787

88-
static uint8_t DevEui[] = LORAWAN_DEVICE_EUI;
89-
static uint8_t JoinEui[] = LORAWAN_JOIN_EUI;
9088
#if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x )
9189
static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY;
9290
#else
@@ -327,8 +325,6 @@ static void JoinNetwork( void )
327325
LoRaMacStatus_t status;
328326
MlmeReq_t mlmeReq;
329327
mlmeReq.Type = MLME_JOIN;
330-
mlmeReq.Req.Join.DevEui = DevEui;
331-
mlmeReq.Req.Join.JoinEui = JoinEui;
332328
mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE;
333329

334330
// Starts the join procedure
@@ -938,6 +934,8 @@ int main( void )
938934
LoRaMacCallback_t macCallbacks;
939935
MibRequestConfirm_t mibReq;
940936
LoRaMacStatus_t status;
937+
uint8_t devEui[] = LORAWAN_DEVICE_EUI;
938+
uint8_t joinEui[] = LORAWAN_JOIN_EUI;
941939

942940
BoardInitMcu( );
943941
BoardInitPeriph( );
@@ -1008,6 +1006,14 @@ int main( void )
10081006
BoardGetUniqueId( DevEui );
10091007
}
10101008

1009+
mibReq.Type = MIB_DEV_EUI;
1010+
mibReq.Param.DevEui = devEui;
1011+
LoRaMacMibSetRequestConfirm( &mibReq );
1012+
1013+
mibReq.Type = MIB_JOIN_EUI;
1014+
mibReq.Param.JoinEui = joinEui;
1015+
LoRaMacMibSetRequestConfirm( &mibReq );
1016+
10111017
#if( OVER_THE_AIR_ACTIVATION == 0 )
10121018
// Choose a random device address if not already defined in Commissioning.h
10131019
if( DevAddr == 0 )

‎src/apps/LoRaMac/classA/NAMote72/main.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@
8888
*/
8989
#define LORAWAN_APP_PORT 2
9090

91-
static uint8_t DevEui[] = LORAWAN_DEVICE_EUI;
92-
static uint8_t JoinEui[] = LORAWAN_JOIN_EUI;
9391
#if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x )
9492
static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY;
9593
#else
@@ -330,8 +328,6 @@ static void JoinNetwork( void )
330328
LoRaMacStatus_t status;
331329
MlmeReq_t mlmeReq;
332330
mlmeReq.Type = MLME_JOIN;
333-
mlmeReq.Req.Join.DevEui = DevEui;
334-
mlmeReq.Req.Join.JoinEui = JoinEui;
335331
mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE;
336332

337333
// Starts the join procedure
@@ -1031,6 +1027,8 @@ int main( void )
10311027
LoRaMacCallback_t macCallbacks;
10321028
MibRequestConfirm_t mibReq;
10331029
LoRaMacStatus_t status;
1030+
uint8_t devEui[] = LORAWAN_DEVICE_EUI;
1031+
uint8_t joinEui[] = LORAWAN_JOIN_EUI;
10341032

10351033
BoardInitMcu( );
10361034
BoardInitPeriph( );
@@ -1101,6 +1099,14 @@ int main( void )
11011099
BoardGetUniqueId( DevEui );
11021100
}
11031101

1102+
mibReq.Type = MIB_DEV_EUI;
1103+
mibReq.Param.DevEui = devEui;
1104+
LoRaMacMibSetRequestConfirm( &mibReq );
1105+
1106+
mibReq.Type = MIB_JOIN_EUI;
1107+
mibReq.Param.JoinEui = joinEui;
1108+
LoRaMacMibSetRequestConfirm( &mibReq );
1109+
11041110
#if( OVER_THE_AIR_ACTIVATION == 0 )
11051111
// Choose a random device address if not already defined in Commissioning.h
11061112
if( DevAddr == 0 )

‎src/apps/LoRaMac/classA/NucleoL073/main.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@
8585
*/
8686
#define LORAWAN_APP_PORT 2
8787

88-
static uint8_t DevEui[] = LORAWAN_DEVICE_EUI;
89-
static uint8_t JoinEui[] = LORAWAN_JOIN_EUI;
9088
#if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x )
9189
static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY;
9290
#else
@@ -326,8 +324,6 @@ static void JoinNetwork( void )
326324
LoRaMacStatus_t status;
327325
MlmeReq_t mlmeReq;
328326
mlmeReq.Type = MLME_JOIN;
329-
mlmeReq.Req.Join.DevEui = DevEui;
330-
mlmeReq.Req.Join.JoinEui = JoinEui;
331327
mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE;
332328

333329
// Starts the join procedure
@@ -936,6 +932,8 @@ int main( void )
936932
LoRaMacCallback_t macCallbacks;
937933
MibRequestConfirm_t mibReq;
938934
LoRaMacStatus_t status;
935+
uint8_t devEui[] = LORAWAN_DEVICE_EUI;
936+
uint8_t joinEui[] = LORAWAN_JOIN_EUI;
939937

940938
BoardInitMcu( );
941939
BoardInitPeriph( );
@@ -1006,6 +1004,14 @@ int main( void )
10061004
BoardGetUniqueId( DevEui );
10071005
}
10081006

1007+
mibReq.Type = MIB_DEV_EUI;
1008+
mibReq.Param.DevEui = devEui;
1009+
LoRaMacMibSetRequestConfirm( &mibReq );
1010+
1011+
mibReq.Type = MIB_JOIN_EUI;
1012+
mibReq.Param.JoinEui = joinEui;
1013+
LoRaMacMibSetRequestConfirm( &mibReq );
1014+
10091015
#if( OVER_THE_AIR_ACTIVATION == 0 )
10101016
// Choose a random device address if not already defined in Commissioning.h
10111017
if( DevAddr == 0 )

‎src/apps/LoRaMac/classA/NucleoL152/main.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@
8585
*/
8686
#define LORAWAN_APP_PORT 2
8787

88-
static uint8_t DevEui[] = LORAWAN_DEVICE_EUI;
89-
static uint8_t JoinEui[] = LORAWAN_JOIN_EUI;
9088
#if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x )
9189
static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY;
9290
#else
@@ -326,8 +324,6 @@ static void JoinNetwork( void )
326324
LoRaMacStatus_t status;
327325
MlmeReq_t mlmeReq;
328326
mlmeReq.Type = MLME_JOIN;
329-
mlmeReq.Req.Join.DevEui = DevEui;
330-
mlmeReq.Req.Join.JoinEui = JoinEui;
331327
mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE;
332328

333329
// Starts the join procedure
@@ -936,6 +932,8 @@ int main( void )
936932
LoRaMacCallback_t macCallbacks;
937933
MibRequestConfirm_t mibReq;
938934
LoRaMacStatus_t status;
935+
uint8_t devEui[] = LORAWAN_DEVICE_EUI;
936+
uint8_t joinEui[] = LORAWAN_JOIN_EUI;
939937

940938
BoardInitMcu( );
941939
BoardInitPeriph( );
@@ -1006,6 +1004,14 @@ int main( void )
10061004
BoardGetUniqueId( DevEui );
10071005
}
10081006

1007+
mibReq.Type = MIB_DEV_EUI;
1008+
mibReq.Param.DevEui = devEui;
1009+
LoRaMacMibSetRequestConfirm( &mibReq );
1010+
1011+
mibReq.Type = MIB_JOIN_EUI;
1012+
mibReq.Param.JoinEui = joinEui;
1013+
LoRaMacMibSetRequestConfirm( &mibReq );
1014+
10091015
#if( OVER_THE_AIR_ACTIVATION == 0 )
10101016
// Choose a random device address if not already defined in Commissioning.h
10111017
if( DevAddr == 0 )

‎src/apps/LoRaMac/classA/NucleoL476/main.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@
8585
*/
8686
#define LORAWAN_APP_PORT 2
8787

88-
static uint8_t DevEui[] = LORAWAN_DEVICE_EUI;
89-
static uint8_t JoinEui[] = LORAWAN_JOIN_EUI;
9088
#if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x )
9189
static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY;
9290
#else
@@ -326,8 +324,6 @@ static void JoinNetwork( void )
326324
LoRaMacStatus_t status;
327325
MlmeReq_t mlmeReq;
328326
mlmeReq.Type = MLME_JOIN;
329-
mlmeReq.Req.Join.DevEui = DevEui;
330-
mlmeReq.Req.Join.JoinEui = JoinEui;
331327
mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE;
332328

333329
// Starts the join procedure
@@ -936,6 +932,8 @@ int main( void )
936932
LoRaMacCallback_t macCallbacks;
937933
MibRequestConfirm_t mibReq;
938934
LoRaMacStatus_t status;
935+
uint8_t devEui[] = LORAWAN_DEVICE_EUI;
936+
uint8_t joinEui[] = LORAWAN_JOIN_EUI;
939937

940938
BoardInitMcu( );
941939
BoardInitPeriph( );
@@ -1006,6 +1004,14 @@ int main( void )
10061004
BoardGetUniqueId( DevEui );
10071005
}
10081006

1007+
mibReq.Type = MIB_DEV_EUI;
1008+
mibReq.Param.DevEui = devEui;
1009+
LoRaMacMibSetRequestConfirm( &mibReq );
1010+
1011+
mibReq.Type = MIB_JOIN_EUI;
1012+
mibReq.Param.JoinEui = joinEui;
1013+
LoRaMacMibSetRequestConfirm( &mibReq );
1014+
10091015
#if( OVER_THE_AIR_ACTIVATION == 0 )
10101016
// Choose a random device address if not already defined in Commissioning.h
10111017
if( DevAddr == 0 )

‎src/apps/LoRaMac/classA/SAML21/main.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@
9292
*/
9393
#define LORAWAN_APP_PORT 2
9494

95-
static uint8_t DevEui[] = LORAWAN_DEVICE_EUI;
96-
static uint8_t JoinEui[] = LORAWAN_JOIN_EUI;
9795
#if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x )
9896
static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY;
9997
#else
@@ -332,8 +330,6 @@ static void JoinNetwork( void )
332330
LoRaMacStatus_t status;
333331
MlmeReq_t mlmeReq;
334332
mlmeReq.Type = MLME_JOIN;
335-
mlmeReq.Req.Join.DevEui = DevEui;
336-
mlmeReq.Req.Join.JoinEui = JoinEui;
337333
mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE;
338334

339335
// Starts the join procedure
@@ -942,6 +938,8 @@ int main( void )
942938
LoRaMacCallback_t macCallbacks;
943939
MibRequestConfirm_t mibReq;
944940
LoRaMacStatus_t status;
941+
uint8_t devEui[] = LORAWAN_DEVICE_EUI;
942+
uint8_t joinEui[] = LORAWAN_JOIN_EUI;
945943

946944
BoardInitMcu( );
947945
BoardInitPeriph( );
@@ -1014,6 +1012,14 @@ int main( void )
10141012
BoardGetUniqueId( DevEui );
10151013
}
10161014

1015+
mibReq.Type = MIB_DEV_EUI;
1016+
mibReq.Param.DevEui = devEui;
1017+
LoRaMacMibSetRequestConfirm( &mibReq );
1018+
1019+
mibReq.Type = MIB_JOIN_EUI;
1020+
mibReq.Param.JoinEui = joinEui;
1021+
LoRaMacMibSetRequestConfirm( &mibReq );
1022+
10171023
#if( OVER_THE_AIR_ACTIVATION == 0 )
10181024
// Choose a random device address if not already defined in Commissioning.h
10191025
if( DevAddr == 0 )

‎src/apps/LoRaMac/classA/SKiM880B/main.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@
8787
*/
8888
#define LORAWAN_APP_PORT 3
8989

90-
static uint8_t DevEui[] = LORAWAN_DEVICE_EUI;
91-
static uint8_t JoinEui[] = LORAWAN_JOIN_EUI;
9290
#if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x )
9391
static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY;
9492
#else
@@ -329,8 +327,6 @@ static void JoinNetwork( void )
329327
LoRaMacStatus_t status;
330328
MlmeReq_t mlmeReq;
331329
mlmeReq.Type = MLME_JOIN;
332-
mlmeReq.Req.Join.DevEui = DevEui;
333-
mlmeReq.Req.Join.JoinEui = JoinEui;
334330
mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE;
335331

336332
// Starts the join procedure
@@ -952,6 +948,8 @@ int main( void )
952948
LoRaMacCallback_t macCallbacks;
953949
MibRequestConfirm_t mibReq;
954950
LoRaMacStatus_t status;
951+
uint8_t devEui[] = LORAWAN_DEVICE_EUI;
952+
uint8_t joinEui[] = LORAWAN_JOIN_EUI;
955953

956954
BoardInitMcu( );
957955
BoardInitPeriph( );
@@ -1022,6 +1020,14 @@ int main( void )
10221020
BoardGetUniqueId( DevEui );
10231021
}
10241022

1023+
mibReq.Type = MIB_DEV_EUI;
1024+
mibReq.Param.DevEui = devEui;
1025+
LoRaMacMibSetRequestConfirm( &mibReq );
1026+
1027+
mibReq.Type = MIB_JOIN_EUI;
1028+
mibReq.Param.JoinEui = joinEui;
1029+
LoRaMacMibSetRequestConfirm( &mibReq );
1030+
10251031
#if( OVER_THE_AIR_ACTIVATION == 0 )
10261032
// Choose a random device address if not already defined in Commissioning.h
10271033
if( DevAddr == 0 )

‎src/apps/LoRaMac/classA/SKiM881AXL/main.c‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@
8787
*/
8888
#define LORAWAN_APP_PORT 3
8989

90-
static uint8_t DevEui[] = LORAWAN_DEVICE_EUI;
91-
static uint8_t JoinEui[] = LORAWAN_JOIN_EUI;
9290
#if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x )
9391
static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY;
9492
#else
@@ -329,8 +327,6 @@ static void JoinNetwork( void )
329327
LoRaMacStatus_t status;
330328
MlmeReq_t mlmeReq;
331329
mlmeReq.Type = MLME_JOIN;
332-
mlmeReq.Req.Join.DevEui = DevEui;
333-
mlmeReq.Req.Join.JoinEui = JoinEui;
334330
mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE;
335331

336332
// Starts the join procedure
@@ -952,6 +948,8 @@ int main( void )
952948
LoRaMacCallback_t macCallbacks;
953949
MibRequestConfirm_t mibReq;
954950
LoRaMacStatus_t status;
951+
uint8_t devEui[] = LORAWAN_DEVICE_EUI;
952+
uint8_t joinEui[] = LORAWAN_JOIN_EUI;
955953

956954
BoardInitMcu( );
957955
BoardInitPeriph( );
@@ -1021,6 +1019,13 @@ int main( void )
10211019
{
10221020
BoardGetUniqueId( DevEui );
10231021
}
1022+
mibReq.Type = MIB_DEV_EUI;
1023+
mibReq.Param.DevEui = devEui;
1024+
LoRaMacMibSetRequestConfirm( &mibReq );
1025+
1026+
mibReq.Type = MIB_JOIN_EUI;
1027+
mibReq.Param.JoinEui = joinEui;
1028+
LoRaMacMibSetRequestConfirm( &mibReq );
10241029

10251030
#if( OVER_THE_AIR_ACTIVATION == 0 )
10261031
// Choose a random device address if not already defined in Commissioning.h

‎src/apps/LoRaMac/classA/SKiM980A/main.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@
8787
*/
8888
#define LORAWAN_APP_PORT 3
8989

90-
static uint8_t DevEui[] = LORAWAN_DEVICE_EUI;
91-
static uint8_t JoinEui[] = LORAWAN_JOIN_EUI;
9290
#if( ABP_ACTIVATION_LRWAN_VERSION == ABP_ACTIVATION_LRWAN_VERSION_V10x )
9391
static uint8_t GenAppKey[] = LORAWAN_GEN_APP_KEY;
9492
#else
@@ -329,8 +327,6 @@ static void JoinNetwork( void )
329327
LoRaMacStatus_t status;
330328
MlmeReq_t mlmeReq;
331329
mlmeReq.Type = MLME_JOIN;
332-
mlmeReq.Req.Join.DevEui = DevEui;
333-
mlmeReq.Req.Join.JoinEui = JoinEui;
334330
mlmeReq.Req.Join.Datarate = LORAWAN_DEFAULT_DATARATE;
335331

336332
// Starts the join procedure
@@ -952,6 +948,8 @@ int main( void )
952948
LoRaMacCallback_t macCallbacks;
953949
MibRequestConfirm_t mibReq;
954950
LoRaMacStatus_t status;
951+
uint8_t devEui[] = LORAWAN_DEVICE_EUI;
952+
uint8_t joinEui[] = LORAWAN_JOIN_EUI;
955953

956954
BoardInitMcu( );
957955
BoardInitPeriph( );
@@ -1022,6 +1020,14 @@ int main( void )
10221020
BoardGetUniqueId( DevEui );
10231021
}
10241022

1023+
mibReq.Type = MIB_DEV_EUI;
1024+
mibReq.Param.DevEui = devEui;
1025+
LoRaMacMibSetRequestConfirm( &mibReq );
1026+
1027+
mibReq.Type = MIB_JOIN_EUI;
1028+
mibReq.Param.JoinEui = joinEui;
1029+
LoRaMacMibSetRequestConfirm( &mibReq );
1030+
10251031
#if( OVER_THE_AIR_ACTIVATION == 0 )
10261032
// Choose a random device address if not already defined in Commissioning.h
10271033
if( DevAddr == 0 )

0 commit comments

Comments
 (0)