Skip to content

Commit

Permalink
Fix examples DevEUI and JoinEUI handling.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mluis1
mluis1 committed Jul 9, 2019
1 parent d685fd8 commit b13d0e4
Show file tree
Hide file tree
Showing 27 changed files with 352 additions and 243 deletions.
22 changes: 13 additions & 9 deletions src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -998,12 +998,12 @@ int main( void )
LoRaMacMibSetRequestConfirm( &mibReq );

// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
{
BoardGetUniqueId( DevEui );
BoardGetUniqueId( devEui );
}

mibReq.Type = MIB_DEV_EUI;
Expand Down Expand Up @@ -1100,16 +1100,20 @@ int main( void )
}
case DEVICE_STATE_JOIN:
{
printf( "DevEui : %02X", DevEui[0] );
mibReq.Type = MIB_DEV_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", DevEui[i] );
printf( "-%02X", mibReq.Param.DevEui[i] );
}
printf( "\r\n" );
printf( "AppEui : %02X", JoinEui[0] );
mibReq.Type = MIB_JOIN_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", JoinEui[i] );
printf( "-%02X", mibReq.Param.JoinEui[i] );
}
printf( "\r\n" );
printf( "AppKey : %02X", NwkKey[0] );
Expand Down
22 changes: 13 additions & 9 deletions src/apps/LoRaMac/classA/NAMote72/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1091,12 +1091,12 @@ int main( void )
LoRaMacMibSetRequestConfirm( &mibReq );

// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
{
BoardGetUniqueId( DevEui );
BoardGetUniqueId( devEui );
}

mibReq.Type = MIB_DEV_EUI;
Expand Down Expand Up @@ -1193,16 +1193,20 @@ int main( void )
}
case DEVICE_STATE_JOIN:
{
printf( "DevEui : %02X", DevEui[0] );
mibReq.Type = MIB_DEV_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", DevEui[i] );
printf( "-%02X", mibReq.Param.DevEui[i] );
}
printf( "\r\n" );
printf( "AppEui : %02X", JoinEui[0] );
mibReq.Type = MIB_JOIN_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", JoinEui[i] );
printf( "-%02X", mibReq.Param.JoinEui[i] );
}
printf( "\r\n" );
printf( "AppKey : %02X", NwkKey[0] );
Expand Down
22 changes: 13 additions & 9 deletions src/apps/LoRaMac/classA/NucleoL073/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -996,12 +996,12 @@ int main( void )
LoRaMacMibSetRequestConfirm( &mibReq );

// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
{
BoardGetUniqueId( DevEui );
BoardGetUniqueId( devEui );
}

mibReq.Type = MIB_DEV_EUI;
Expand Down Expand Up @@ -1098,16 +1098,20 @@ int main( void )
}
case DEVICE_STATE_JOIN:
{
printf( "DevEui : %02X", DevEui[0] );
mibReq.Type = MIB_DEV_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", DevEui[i] );
printf( "-%02X", mibReq.Param.DevEui[i] );
}
printf( "\r\n" );
printf( "AppEui : %02X", JoinEui[0] );
mibReq.Type = MIB_JOIN_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", JoinEui[i] );
printf( "-%02X", mibReq.Param.JoinEui[i] );
}
printf( "\r\n" );
printf( "AppKey : %02X", NwkKey[0] );
Expand Down
22 changes: 13 additions & 9 deletions src/apps/LoRaMac/classA/NucleoL152/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -996,12 +996,12 @@ int main( void )
LoRaMacMibSetRequestConfirm( &mibReq );

// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
{
BoardGetUniqueId( DevEui );
BoardGetUniqueId( devEui );
}

mibReq.Type = MIB_DEV_EUI;
Expand Down Expand Up @@ -1098,16 +1098,20 @@ int main( void )
}
case DEVICE_STATE_JOIN:
{
printf( "DevEui : %02X", DevEui[0] );
mibReq.Type = MIB_DEV_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", DevEui[i] );
printf( "-%02X", mibReq.Param.DevEui[i] );
}
printf( "\r\n" );
printf( "AppEui : %02X", JoinEui[0] );
mibReq.Type = MIB_JOIN_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", JoinEui[i] );
printf( "-%02X", mibReq.Param.JoinEui[i] );
}
printf( "\r\n" );
printf( "AppKey : %02X", NwkKey[0] );
Expand Down
22 changes: 13 additions & 9 deletions src/apps/LoRaMac/classA/NucleoL476/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -996,12 +996,12 @@ int main( void )
LoRaMacMibSetRequestConfirm( &mibReq );

// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
{
BoardGetUniqueId( DevEui );
BoardGetUniqueId( devEui );
}

mibReq.Type = MIB_DEV_EUI;
Expand Down Expand Up @@ -1098,16 +1098,20 @@ int main( void )
}
case DEVICE_STATE_JOIN:
{
printf( "DevEui : %02X", DevEui[0] );
mibReq.Type = MIB_DEV_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", DevEui[i] );
printf( "-%02X", mibReq.Param.DevEui[i] );
}
printf( "\r\n" );
printf( "AppEui : %02X", JoinEui[0] );
mibReq.Type = MIB_JOIN_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", JoinEui[i] );
printf( "-%02X", mibReq.Param.JoinEui[i] );
}
printf( "\r\n" );
printf( "AppKey : %02X", NwkKey[0] );
Expand Down
22 changes: 13 additions & 9 deletions src/apps/LoRaMac/classA/SAML21/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1004,12 +1004,12 @@ int main( void )
LoRaMacMibSetRequestConfirm( &mibReq );

// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
{
BoardGetUniqueId( DevEui );
BoardGetUniqueId( devEui );
}

mibReq.Type = MIB_DEV_EUI;
Expand Down Expand Up @@ -1125,16 +1125,20 @@ int main( void )
}
case DEVICE_STATE_JOIN:
{
printf( "DevEui : %02X", DevEui[0] );
mibReq.Type = MIB_DEV_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", DevEui[i] );
printf( "-%02X", mibReq.Param.DevEui[i] );
}
printf( "\r\n" );
printf( "AppEui : %02X", JoinEui[0] );
mibReq.Type = MIB_JOIN_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", JoinEui[i] );
printf( "-%02X", mibReq.Param.JoinEui[i] );
}
printf( "\r\n" );
printf( "AppKey : %02X", NwkKey[0] );
Expand Down
22 changes: 13 additions & 9 deletions src/apps/LoRaMac/classA/SKiM880B/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1012,12 +1012,12 @@ int main( void )
LoRaMacMibSetRequestConfirm( &mibReq );

// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
{
BoardGetUniqueId( DevEui );
BoardGetUniqueId( devEui );
}

mibReq.Type = MIB_DEV_EUI;
Expand Down Expand Up @@ -1114,16 +1114,20 @@ int main( void )
}
case DEVICE_STATE_JOIN:
{
printf( "DevEui : %02X", DevEui[0] );
mibReq.Type = MIB_DEV_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", DevEui[i] );
printf( "-%02X", mibReq.Param.DevEui[i] );
}
printf( "\r\n" );
printf( "AppEui : %02X", JoinEui[0] );
mibReq.Type = MIB_JOIN_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", JoinEui[i] );
printf( "-%02X", mibReq.Param.JoinEui[i] );
}
printf( "\r\n" );
printf( "AppKey : %02X", NwkKey[0] );
Expand Down
23 changes: 14 additions & 9 deletions src/apps/LoRaMac/classA/SKiM881AXL/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1012,13 +1012,14 @@ int main( void )
LoRaMacMibSetRequestConfirm( &mibReq );

// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
{
BoardGetUniqueId( DevEui );
BoardGetUniqueId( devEui );
}

mibReq.Type = MIB_DEV_EUI;
mibReq.Param.DevEui = devEui;
LoRaMacMibSetRequestConfirm( &mibReq );
Expand Down Expand Up @@ -1113,16 +1114,20 @@ int main( void )
}
case DEVICE_STATE_JOIN:
{
printf( "DevEui : %02X", DevEui[0] );
mibReq.Type = MIB_DEV_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", DevEui[i] );
printf( "-%02X", mibReq.Param.DevEui[i] );
}
printf( "\r\n" );
printf( "AppEui : %02X", JoinEui[0] );
mibReq.Type = MIB_JOIN_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", JoinEui[i] );
printf( "-%02X", mibReq.Param.JoinEui[i] );
}
printf( "\r\n" );
printf( "AppKey : %02X", NwkKey[0] );
Expand Down
22 changes: 13 additions & 9 deletions src/apps/LoRaMac/classA/SKiM980A/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1012,12 +1012,12 @@ int main( void )
LoRaMacMibSetRequestConfirm( &mibReq );

// Initialize LoRaMac device unique ID if not already defined in Commissioning.h
if( ( DevEui[0] == 0 ) && ( DevEui[1] == 0 ) &&
( DevEui[2] == 0 ) && ( DevEui[3] == 0 ) &&
( DevEui[4] == 0 ) && ( DevEui[5] == 0 ) &&
( DevEui[6] == 0 ) && ( DevEui[7] == 0 ) )
if( ( devEui[0] == 0 ) && ( devEui[1] == 0 ) &&
( devEui[2] == 0 ) && ( devEui[3] == 0 ) &&
( devEui[4] == 0 ) && ( devEui[5] == 0 ) &&
( devEui[6] == 0 ) && ( devEui[7] == 0 ) )
{
BoardGetUniqueId( DevEui );
BoardGetUniqueId( devEui );
}

mibReq.Type = MIB_DEV_EUI;
Expand Down Expand Up @@ -1114,16 +1114,20 @@ int main( void )
}
case DEVICE_STATE_JOIN:
{
printf( "DevEui : %02X", DevEui[0] );
mibReq.Type = MIB_DEV_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "DevEui : %02X", mibReq.Param.DevEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", DevEui[i] );
printf( "-%02X", mibReq.Param.DevEui[i] );
}
printf( "\r\n" );
printf( "AppEui : %02X", JoinEui[0] );
mibReq.Type = MIB_JOIN_EUI;
LoRaMacMibGetRequestConfirm( &mibReq );
printf( "AppEui : %02X", mibReq.Param.JoinEui[0] );
for( int i = 1; i < 8; i++ )
{
printf( "-%02X", JoinEui[i] );
printf( "-%02X", mibReq.Param.JoinEui[i] );
}
printf( "\r\n" );
printf( "AppKey : %02X", NwkKey[0] );
Expand Down
Loading

0 comments on commit b13d0e4

Please sign in to comment.