Skip to content

Commit b13d0e4

Browse files
mluis1mluis1
committed
Fix examples DevEUI and JoinEUI handling.
1 parent d685fd8 commit b13d0e4

File tree

27 files changed

+352
-243
lines changed

27 files changed

+352
-243
lines changed

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -998,12 +998,12 @@ int main( void )
998998
LoRaMacMibSetRequestConfirm( &mibReq );
999999

10001000
// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
1001-
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
1002-
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
1003-
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
1004-
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
1001+
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
1002+
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
1003+
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
1004+
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
10051005
{
1006-
BoardGetUniqueId( DevEui );
1006+
BoardGetUniqueId( devEui );
10071007
}
10081008

10091009
mibReq.Type = MIB_DEV_EUI;
@@ -1100,16 +1100,20 @@ int main( void )
11001100
}
11011101
case DEVICE_STATE_JOIN:
11021102
{
1103-
printf( "DevEui : %02X", DevEui[0] );
1103+
mibReq.Type = MIB_DEV_EUI;
1104+
LoRaMacMibGetRequestConfirm( &mibReq );
1105+
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
11041106
for( int i = 1; i < 8; i++ )
11051107
{
1106-
printf( "-%02X", DevEui[i] );
1108+
printf( "-%02X", mibReq.Param.DevEui[i] );
11071109
}
11081110
printf( "\r\n" );
1109-
printf( "AppEui : %02X", JoinEui[0] );
1111+
mibReq.Type = MIB_JOIN_EUI;
1112+
LoRaMacMibGetRequestConfirm( &mibReq );
1113+
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
11101114
for( int i = 1; i < 8; i++ )
11111115
{
1112-
printf( "-%02X", JoinEui[i] );
1116+
printf( "-%02X", mibReq.Param.JoinEui[i] );
11131117
}
11141118
printf( "\r\n" );
11151119
printf( "AppKey : %02X", NwkKey[0] );

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,12 +1091,12 @@ int main( void )
10911091
LoRaMacMibSetRequestConfirm( &mibReq );
10921092

10931093
// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
1094-
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
1095-
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
1096-
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
1097-
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
1094+
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
1095+
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
1096+
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
1097+
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
10981098
{
1099-
BoardGetUniqueId( DevEui );
1099+
BoardGetUniqueId( devEui );
11001100
}
11011101

11021102
mibReq.Type = MIB_DEV_EUI;
@@ -1193,16 +1193,20 @@ int main( void )
11931193
}
11941194
case DEVICE_STATE_JOIN:
11951195
{
1196-
printf( "DevEui : %02X", DevEui[0] );
1196+
mibReq.Type = MIB_DEV_EUI;
1197+
LoRaMacMibGetRequestConfirm( &mibReq );
1198+
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
11971199
for( int i = 1; i < 8; i++ )
11981200
{
1199-
printf( "-%02X", DevEui[i] );
1201+
printf( "-%02X", mibReq.Param.DevEui[i] );
12001202
}
12011203
printf( "\r\n" );
1202-
printf( "AppEui : %02X", JoinEui[0] );
1204+
mibReq.Type = MIB_JOIN_EUI;
1205+
LoRaMacMibGetRequestConfirm( &mibReq );
1206+
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
12031207
for( int i = 1; i < 8; i++ )
12041208
{
1205-
printf( "-%02X", JoinEui[i] );
1209+
printf( "-%02X", mibReq.Param.JoinEui[i] );
12061210
}
12071211
printf( "\r\n" );
12081212
printf( "AppKey : %02X", NwkKey[0] );

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -996,12 +996,12 @@ int main( void )
996996
LoRaMacMibSetRequestConfirm( &mibReq );
997997

998998
// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
999-
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
1000-
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
1001-
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
1002-
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
999+
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
1000+
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
1001+
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
1002+
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
10031003
{
1004-
BoardGetUniqueId( DevEui );
1004+
BoardGetUniqueId( devEui );
10051005
}
10061006

10071007
mibReq.Type = MIB_DEV_EUI;
@@ -1098,16 +1098,20 @@ int main( void )
10981098
}
10991099
case DEVICE_STATE_JOIN:
11001100
{
1101-
printf( "DevEui : %02X", DevEui[0] );
1101+
mibReq.Type = MIB_DEV_EUI;
1102+
LoRaMacMibGetRequestConfirm( &mibReq );
1103+
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
11021104
for( int i = 1; i < 8; i++ )
11031105
{
1104-
printf( "-%02X", DevEui[i] );
1106+
printf( "-%02X", mibReq.Param.DevEui[i] );
11051107
}
11061108
printf( "\r\n" );
1107-
printf( "AppEui : %02X", JoinEui[0] );
1109+
mibReq.Type = MIB_JOIN_EUI;
1110+
LoRaMacMibGetRequestConfirm( &mibReq );
1111+
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
11081112
for( int i = 1; i < 8; i++ )
11091113
{
1110-
printf( "-%02X", JoinEui[i] );
1114+
printf( "-%02X", mibReq.Param.JoinEui[i] );
11111115
}
11121116
printf( "\r\n" );
11131117
printf( "AppKey : %02X", NwkKey[0] );

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -996,12 +996,12 @@ int main( void )
996996
LoRaMacMibSetRequestConfirm( &mibReq );
997997

998998
// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
999-
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
1000-
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
1001-
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
1002-
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
999+
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
1000+
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
1001+
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
1002+
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
10031003
{
1004-
BoardGetUniqueId( DevEui );
1004+
BoardGetUniqueId( devEui );
10051005
}
10061006

10071007
mibReq.Type = MIB_DEV_EUI;
@@ -1098,16 +1098,20 @@ int main( void )
10981098
}
10991099
case DEVICE_STATE_JOIN:
11001100
{
1101-
printf( "DevEui : %02X", DevEui[0] );
1101+
mibReq.Type = MIB_DEV_EUI;
1102+
LoRaMacMibGetRequestConfirm( &mibReq );
1103+
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
11021104
for( int i = 1; i < 8; i++ )
11031105
{
1104-
printf( "-%02X", DevEui[i] );
1106+
printf( "-%02X", mibReq.Param.DevEui[i] );
11051107
}
11061108
printf( "\r\n" );
1107-
printf( "AppEui : %02X", JoinEui[0] );
1109+
mibReq.Type = MIB_JOIN_EUI;
1110+
LoRaMacMibGetRequestConfirm( &mibReq );
1111+
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
11081112
for( int i = 1; i < 8; i++ )
11091113
{
1110-
printf( "-%02X", JoinEui[i] );
1114+
printf( "-%02X", mibReq.Param.JoinEui[i] );
11111115
}
11121116
printf( "\r\n" );
11131117
printf( "AppKey : %02X", NwkKey[0] );

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -996,12 +996,12 @@ int main( void )
996996
LoRaMacMibSetRequestConfirm( &mibReq );
997997

998998
// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
999-
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
1000-
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
1001-
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
1002-
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
999+
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
1000+
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
1001+
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
1002+
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
10031003
{
1004-
BoardGetUniqueId( DevEui );
1004+
BoardGetUniqueId( devEui );
10051005
}
10061006

10071007
mibReq.Type = MIB_DEV_EUI;
@@ -1098,16 +1098,20 @@ int main( void )
10981098
}
10991099
case DEVICE_STATE_JOIN:
11001100
{
1101-
printf( "DevEui : %02X", DevEui[0] );
1101+
mibReq.Type = MIB_DEV_EUI;
1102+
LoRaMacMibGetRequestConfirm( &mibReq );
1103+
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
11021104
for( int i = 1; i < 8; i++ )
11031105
{
1104-
printf( "-%02X", DevEui[i] );
1106+
printf( "-%02X", mibReq.Param.DevEui[i] );
11051107
}
11061108
printf( "\r\n" );
1107-
printf( "AppEui : %02X", JoinEui[0] );
1109+
mibReq.Type = MIB_JOIN_EUI;
1110+
LoRaMacMibGetRequestConfirm( &mibReq );
1111+
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
11081112
for( int i = 1; i < 8; i++ )
11091113
{
1110-
printf( "-%02X", JoinEui[i] );
1114+
printf( "-%02X", mibReq.Param.JoinEui[i] );
11111115
}
11121116
printf( "\r\n" );
11131117
printf( "AppKey : %02X", NwkKey[0] );

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,12 +1004,12 @@ int main( void )
10041004
LoRaMacMibSetRequestConfirm( &mibReq );
10051005

10061006
// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
1007-
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
1008-
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
1009-
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
1010-
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
1007+
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
1008+
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
1009+
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
1010+
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
10111011
{
1012-
BoardGetUniqueId( DevEui );
1012+
BoardGetUniqueId( devEui );
10131013
}
10141014

10151015
mibReq.Type = MIB_DEV_EUI;
@@ -1125,16 +1125,20 @@ int main( void )
11251125
}
11261126
case DEVICE_STATE_JOIN:
11271127
{
1128-
printf( "DevEui : %02X", DevEui[0] );
1128+
mibReq.Type = MIB_DEV_EUI;
1129+
LoRaMacMibGetRequestConfirm( &mibReq );
1130+
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
11291131
for( int i = 1; i < 8; i++ )
11301132
{
1131-
printf( "-%02X", DevEui[i] );
1133+
printf( "-%02X", mibReq.Param.DevEui[i] );
11321134
}
11331135
printf( "\r\n" );
1134-
printf( "AppEui : %02X", JoinEui[0] );
1136+
mibReq.Type = MIB_JOIN_EUI;
1137+
LoRaMacMibGetRequestConfirm( &mibReq );
1138+
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
11351139
for( int i = 1; i < 8; i++ )
11361140
{
1137-
printf( "-%02X", JoinEui[i] );
1141+
printf( "-%02X", mibReq.Param.JoinEui[i] );
11381142
}
11391143
printf( "\r\n" );
11401144
printf( "AppKey : %02X", NwkKey[0] );

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,12 +1012,12 @@ int main( void )
10121012
LoRaMacMibSetRequestConfirm( &mibReq );
10131013

10141014
// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
1015-
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
1016-
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
1017-
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
1018-
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
1015+
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
1016+
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
1017+
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
1018+
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
10191019
{
1020-
BoardGetUniqueId( DevEui );
1020+
BoardGetUniqueId( devEui );
10211021
}
10221022

10231023
mibReq.Type = MIB_DEV_EUI;
@@ -1114,16 +1114,20 @@ int main( void )
11141114
}
11151115
case DEVICE_STATE_JOIN:
11161116
{
1117-
printf( "DevEui : %02X", DevEui[0] );
1117+
mibReq.Type = MIB_DEV_EUI;
1118+
LoRaMacMibGetRequestConfirm( &mibReq );
1119+
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
11181120
for( int i = 1; i < 8; i++ )
11191121
{
1120-
printf( "-%02X", DevEui[i] );
1122+
printf( "-%02X", mibReq.Param.DevEui[i] );
11211123
}
11221124
printf( "\r\n" );
1123-
printf( "AppEui : %02X", JoinEui[0] );
1125+
mibReq.Type = MIB_JOIN_EUI;
1126+
LoRaMacMibGetRequestConfirm( &mibReq );
1127+
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
11241128
for( int i = 1; i < 8; i++ )
11251129
{
1126-
printf( "-%02X", JoinEui[i] );
1130+
printf( "-%02X", mibReq.Param.JoinEui[i] );
11271131
}
11281132
printf( "\r\n" );
11291133
printf( "AppKey : %02X", NwkKey[0] );

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,13 +1012,14 @@ int main( void )
10121012
LoRaMacMibSetRequestConfirm( &mibReq );
10131013

10141014
// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
1015-
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
1016-
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
1017-
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
1018-
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
1015+
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
1016+
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
1017+
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
1018+
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
10191019
{
1020-
BoardGetUniqueId( DevEui );
1020+
BoardGetUniqueId( devEui );
10211021
}
1022+
10221023
mibReq.Type = MIB_DEV_EUI;
10231024
mibReq.Param.DevEui = devEui;
10241025
LoRaMacMibSetRequestConfirm( &mibReq );
@@ -1113,16 +1114,20 @@ int main( void )
11131114
}
11141115
case DEVICE_STATE_JOIN:
11151116
{
1116-
printf( "DevEui : %02X", DevEui[0] );
1117+
mibReq.Type = MIB_DEV_EUI;
1118+
LoRaMacMibGetRequestConfirm( &mibReq );
1119+
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
11171120
for( int i = 1; i < 8; i++ )
11181121
{
1119-
printf( "-%02X", DevEui[i] );
1122+
printf( "-%02X", mibReq.Param.DevEui[i] );
11201123
}
11211124
printf( "\r\n" );
1122-
printf( "AppEui : %02X", JoinEui[0] );
1125+
mibReq.Type = MIB_JOIN_EUI;
1126+
LoRaMacMibGetRequestConfirm( &mibReq );
1127+
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
11231128
for( int i = 1; i < 8; i++ )
11241129
{
1125-
printf( "-%02X", JoinEui[i] );
1130+
printf( "-%02X", mibReq.Param.JoinEui[i] );
11261131
}
11271132
printf( "\r\n" );
11281133
printf( "AppKey : %02X", NwkKey[0] );

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,12 +1012,12 @@ int main( void )
10121012
LoRaMacMibSetRequestConfirm( &mibReq );
10131013

10141014
// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
1015-
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
1016-
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
1017-
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
1018-
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
1015+
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
1016+
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
1017+
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
1018+
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
10191019
{
1020-
BoardGetUniqueId( DevEui );
1020+
BoardGetUniqueId( devEui );
10211021
}
10221022

10231023
mibReq.Type = MIB_DEV_EUI;
@@ -1114,16 +1114,20 @@ int main( void )
11141114
}
11151115
case DEVICE_STATE_JOIN:
11161116
{
1117-
printf( "DevEui : %02X", DevEui[0] );
1117+
mibReq.Type = MIB_DEV_EUI;
1118+
LoRaMacMibGetRequestConfirm( &mibReq );
1119+
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
11181120
for( int i = 1; i < 8; i++ )
11191121
{
1120-
printf( "-%02X", DevEui[i] );
1122+
printf( "-%02X", mibReq.Param.DevEui[i] );
11211123
}
11221124
printf( "\r\n" );
1123-
printf( "AppEui : %02X", JoinEui[0] );
1125+
mibReq.Type = MIB_JOIN_EUI;
1126+
LoRaMacMibGetRequestConfirm( &mibReq );
1127+
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
11241128
for( int i = 1; i < 8; i++ )
11251129
{
1126-
printf( "-%02X", JoinEui[i] );
1130+
printf( "-%02X", mibReq.Param.JoinEui[i] );
11271131
}
11281132
printf( "\r\n" );
11291133
printf( "AppKey : %02X", NwkKey[0] );

0 commit comments

Comments
 (0)