diff --git a/src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c b/src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c index 3ac0abc1f..70e835c96 100644 --- a/src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c +++ b/src/apps/LoRaMac/classA/B-L072Z-LRWAN1/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classA/NAMote72/main.c b/src/apps/LoRaMac/classA/NAMote72/main.c index 6e9a2b675..b51b18d3e 100644 --- a/src/apps/LoRaMac/classA/NAMote72/main.c +++ b/src/apps/LoRaMac/classA/NAMote72/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classA/NucleoL073/main.c b/src/apps/LoRaMac/classA/NucleoL073/main.c index 8952adf20..fa7022eba 100644 --- a/src/apps/LoRaMac/classA/NucleoL073/main.c +++ b/src/apps/LoRaMac/classA/NucleoL073/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classA/NucleoL152/main.c b/src/apps/LoRaMac/classA/NucleoL152/main.c index 360d87e0f..e04ba7122 100644 --- a/src/apps/LoRaMac/classA/NucleoL152/main.c +++ b/src/apps/LoRaMac/classA/NucleoL152/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classA/NucleoL476/main.c b/src/apps/LoRaMac/classA/NucleoL476/main.c index cd4ad03a7..f49707911 100644 --- a/src/apps/LoRaMac/classA/NucleoL476/main.c +++ b/src/apps/LoRaMac/classA/NucleoL476/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classA/SAML21/main.c b/src/apps/LoRaMac/classA/SAML21/main.c index eef40c1ee..517ffc5a3 100644 --- a/src/apps/LoRaMac/classA/SAML21/main.c +++ b/src/apps/LoRaMac/classA/SAML21/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classA/SKiM880B/main.c b/src/apps/LoRaMac/classA/SKiM880B/main.c index 046b295c9..9810b335e 100644 --- a/src/apps/LoRaMac/classA/SKiM880B/main.c +++ b/src/apps/LoRaMac/classA/SKiM880B/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classA/SKiM881AXL/main.c b/src/apps/LoRaMac/classA/SKiM881AXL/main.c index 5f500563c..9c06c9c58 100644 --- a/src/apps/LoRaMac/classA/SKiM881AXL/main.c +++ b/src/apps/LoRaMac/classA/SKiM881AXL/main.c @@ -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 ); @@ -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] ); diff --git a/src/apps/LoRaMac/classA/SKiM980A/main.c b/src/apps/LoRaMac/classA/SKiM980A/main.c index 6bf3fa007..c6755564a 100644 --- a/src/apps/LoRaMac/classA/SKiM980A/main.c +++ b/src/apps/LoRaMac/classA/SKiM980A/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classB/B-L072Z-LRWAN1/main.c b/src/apps/LoRaMac/classB/B-L072Z-LRWAN1/main.c index cc92d9843..a6011b3d5 100644 --- a/src/apps/LoRaMac/classB/B-L072Z-LRWAN1/main.c +++ b/src/apps/LoRaMac/classB/B-L072Z-LRWAN1/main.c @@ -1201,12 +1201,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; @@ -1309,16 +1309,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] ); diff --git a/src/apps/LoRaMac/classB/NAMote72/main.c b/src/apps/LoRaMac/classB/NAMote72/main.c index 5460788d5..af519c8b1 100644 --- a/src/apps/LoRaMac/classB/NAMote72/main.c +++ b/src/apps/LoRaMac/classB/NAMote72/main.c @@ -1278,12 +1278,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; @@ -1383,16 +1383,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] ); diff --git a/src/apps/LoRaMac/classB/NucleoL073/main.c b/src/apps/LoRaMac/classB/NucleoL073/main.c index 1e15fae2c..3c16dfbc9 100644 --- a/src/apps/LoRaMac/classB/NucleoL073/main.c +++ b/src/apps/LoRaMac/classB/NucleoL073/main.c @@ -1183,12 +1183,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; @@ -1288,16 +1288,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] ); diff --git a/src/apps/LoRaMac/classB/NucleoL152/main.c b/src/apps/LoRaMac/classB/NucleoL152/main.c index d39e805ca..d9b5ed21f 100644 --- a/src/apps/LoRaMac/classB/NucleoL152/main.c +++ b/src/apps/LoRaMac/classB/NucleoL152/main.c @@ -1183,12 +1183,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; @@ -1288,16 +1288,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] ); diff --git a/src/apps/LoRaMac/classB/NucleoL476/main.c b/src/apps/LoRaMac/classB/NucleoL476/main.c index 57f3d04f2..92ce8196b 100644 --- a/src/apps/LoRaMac/classB/NucleoL476/main.c +++ b/src/apps/LoRaMac/classB/NucleoL476/main.c @@ -1183,12 +1183,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; @@ -1288,16 +1288,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] ); diff --git a/src/apps/LoRaMac/classB/SAML21/main.c b/src/apps/LoRaMac/classB/SAML21/main.c index e6a270908..0a7b46578 100644 --- a/src/apps/LoRaMac/classB/SAML21/main.c +++ b/src/apps/LoRaMac/classB/SAML21/main.c @@ -1191,12 +1191,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; @@ -1315,16 +1315,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] ); diff --git a/src/apps/LoRaMac/classB/SKiM880B/main.c b/src/apps/LoRaMac/classB/SKiM880B/main.c index 3905942b8..ada3546f3 100644 --- a/src/apps/LoRaMac/classB/SKiM880B/main.c +++ b/src/apps/LoRaMac/classB/SKiM880B/main.c @@ -1199,12 +1199,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; @@ -1304,16 +1304,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] ); diff --git a/src/apps/LoRaMac/classB/SKiM881AXL/main.c b/src/apps/LoRaMac/classB/SKiM881AXL/main.c index 06b044bf1..859ea7eb1 100644 --- a/src/apps/LoRaMac/classB/SKiM881AXL/main.c +++ b/src/apps/LoRaMac/classB/SKiM881AXL/main.c @@ -1199,12 +1199,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; @@ -1304,16 +1304,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] ); diff --git a/src/apps/LoRaMac/classB/SKiM980A/main.c b/src/apps/LoRaMac/classB/SKiM980A/main.c index ef903e42a..cd61af26e 100644 --- a/src/apps/LoRaMac/classB/SKiM980A/main.c +++ b/src/apps/LoRaMac/classB/SKiM980A/main.c @@ -1199,12 +1199,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; @@ -1304,16 +1304,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] ); diff --git a/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c b/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c index dd4b66afa..73e75414c 100644 --- a/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c +++ b/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classC/NAMote72/main.c b/src/apps/LoRaMac/classC/NAMote72/main.c index 61acee896..fce7df973 100644 --- a/src/apps/LoRaMac/classC/NAMote72/main.c +++ b/src/apps/LoRaMac/classC/NAMote72/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classC/NucleoL073/main.c b/src/apps/LoRaMac/classC/NucleoL073/main.c index ea6815e50..932d243c2 100644 --- a/src/apps/LoRaMac/classC/NucleoL073/main.c +++ b/src/apps/LoRaMac/classC/NucleoL073/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classC/NucleoL152/main.c b/src/apps/LoRaMac/classC/NucleoL152/main.c index 509fa177a..082573acb 100644 --- a/src/apps/LoRaMac/classC/NucleoL152/main.c +++ b/src/apps/LoRaMac/classC/NucleoL152/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classC/NucleoL476/main.c b/src/apps/LoRaMac/classC/NucleoL476/main.c index d27647688..8969a59c2 100644 --- a/src/apps/LoRaMac/classC/NucleoL476/main.c +++ b/src/apps/LoRaMac/classC/NucleoL476/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classC/SAML21/main.c b/src/apps/LoRaMac/classC/SAML21/main.c index 1ed539d6c..07943a121 100644 --- a/src/apps/LoRaMac/classC/SAML21/main.c +++ b/src/apps/LoRaMac/classC/SAML21/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classC/SKiM880B/main.c b/src/apps/LoRaMac/classC/SKiM880B/main.c index ec7214928..10d386c96 100644 --- a/src/apps/LoRaMac/classC/SKiM880B/main.c +++ b/src/apps/LoRaMac/classC/SKiM880B/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classC/SKiM881AXL/main.c b/src/apps/LoRaMac/classC/SKiM881AXL/main.c index e81937422..f17465fdc 100644 --- a/src/apps/LoRaMac/classC/SKiM881AXL/main.c +++ b/src/apps/LoRaMac/classC/SKiM881AXL/main.c @@ -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; @@ -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] ); diff --git a/src/apps/LoRaMac/classC/SKiM980A/main.c b/src/apps/LoRaMac/classC/SKiM980A/main.c index 887b013d7..4cab5de97 100644 --- a/src/apps/LoRaMac/classC/SKiM980A/main.c +++ b/src/apps/LoRaMac/classC/SKiM980A/main.c @@ -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; @@ -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] );