From 0bd3b6a498b362be95b6c0d7b925e92776df790e Mon Sep 17 00:00:00 2001
From: Miguel Luis <mluis@semtech.com>
Date: Tue, 2 Jul 2019 14:45:42 +0200
Subject: [PATCH] Update ClassC examples due to changes done on commit
 198a8295be4a51f16384c8c107b4abdcf52683fd

---
 src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c | 13 +++++++++----
 src/apps/LoRaMac/classC/NAMote72/main.c       | 13 +++++++++----
 src/apps/LoRaMac/classC/NucleoL073/main.c     | 13 +++++++++----
 src/apps/LoRaMac/classC/NucleoL152/main.c     | 13 +++++++++----
 src/apps/LoRaMac/classC/NucleoL476/main.c     | 13 +++++++++----
 src/apps/LoRaMac/classC/SAML21/main.c         | 13 +++++++++----
 src/apps/LoRaMac/classC/SKiM880B/main.c       | 13 +++++++++----
 src/apps/LoRaMac/classC/SKiM881AXL/main.c     | 13 +++++++++----
 src/apps/LoRaMac/classC/SKiM980A/main.c       | 13 +++++++++----
 9 files changed, 81 insertions(+), 36 deletions(-)

diff --git a/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c b/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c
index 9de3a8550..f5ad0dd5a 100644
--- a/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c
+++ b/src/apps/LoRaMac/classC/B-L072Z-LRWAN1/main.c
@@ -1073,10 +1073,6 @@ int main( void )
                 mibReq.Param.SystemMaxRxError = 20;
                 LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mibReq.Type = MIB_DEVICE_CLASS;
-                mibReq.Param.Class = CLASS_C;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
                 LoRaMacStart( );
 
                 mibReq.Type = MIB_NETWORK_ACTIVATION;
@@ -1147,6 +1143,15 @@ int main( void )
             {
                 if( NextTx == true )
                 {
+                    mibReq.Type = MIB_DEVICE_CLASS;
+                    LoRaMacMibGetRequestConfirm( &mibReq );
+
+                    if( mibReq.Param.Class!= CLASS_C )
+                    {
+                        mibReq.Param.Class = CLASS_C;
+                        LoRaMacMibSetRequestConfirm( &mibReq );
+                    }
+
                     PrepareTxFrame( AppPort );
 
                     NextTx = SendFrame( );
diff --git a/src/apps/LoRaMac/classC/NAMote72/main.c b/src/apps/LoRaMac/classC/NAMote72/main.c
index e8d3df603..aec5bf726 100644
--- a/src/apps/LoRaMac/classC/NAMote72/main.c
+++ b/src/apps/LoRaMac/classC/NAMote72/main.c
@@ -1166,10 +1166,6 @@ int main( void )
                 mibReq.Param.SystemMaxRxError = 20;
                 LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mibReq.Type = MIB_DEVICE_CLASS;
-                mibReq.Param.Class = CLASS_C;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
                 LoRaMacStart( );
 
                 mibReq.Type = MIB_NETWORK_ACTIVATION;
@@ -1240,6 +1236,15 @@ int main( void )
             {
                 if( NextTx == true )
                 {
+                    mibReq.Type = MIB_DEVICE_CLASS;
+                    LoRaMacMibGetRequestConfirm( &mibReq );
+
+                    if( mibReq.Param.Class!= CLASS_C )
+                    {
+                        mibReq.Param.Class = CLASS_C;
+                        LoRaMacMibSetRequestConfirm( &mibReq );
+                    }
+
                     PrepareTxFrame( AppPort );
 
                     NextTx = SendFrame( );
diff --git a/src/apps/LoRaMac/classC/NucleoL073/main.c b/src/apps/LoRaMac/classC/NucleoL073/main.c
index 5d4a2a603..e47796769 100644
--- a/src/apps/LoRaMac/classC/NucleoL073/main.c
+++ b/src/apps/LoRaMac/classC/NucleoL073/main.c
@@ -1071,10 +1071,6 @@ int main( void )
                 mibReq.Param.SystemMaxRxError = 20;
                 LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mibReq.Type = MIB_DEVICE_CLASS;
-                mibReq.Param.Class = CLASS_C;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
                 LoRaMacStart( );
 
                 mibReq.Type = MIB_NETWORK_ACTIVATION;
@@ -1145,6 +1141,15 @@ int main( void )
             {
                 if( NextTx == true )
                 {
+                    mibReq.Type = MIB_DEVICE_CLASS;
+                    LoRaMacMibGetRequestConfirm( &mibReq );
+
+                    if( mibReq.Param.Class!= CLASS_C )
+                    {
+                        mibReq.Param.Class = CLASS_C;
+                        LoRaMacMibSetRequestConfirm( &mibReq );
+                    }
+
                     PrepareTxFrame( AppPort );
 
                     NextTx = SendFrame( );
diff --git a/src/apps/LoRaMac/classC/NucleoL152/main.c b/src/apps/LoRaMac/classC/NucleoL152/main.c
index 06561114f..bf53bef28 100644
--- a/src/apps/LoRaMac/classC/NucleoL152/main.c
+++ b/src/apps/LoRaMac/classC/NucleoL152/main.c
@@ -1071,10 +1071,6 @@ int main( void )
                 mibReq.Param.SystemMaxRxError = 20;
                 LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mibReq.Type = MIB_DEVICE_CLASS;
-                mibReq.Param.Class = CLASS_C;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
                 LoRaMacStart( );
 
                 mibReq.Type = MIB_NETWORK_ACTIVATION;
@@ -1145,6 +1141,15 @@ int main( void )
             {
                 if( NextTx == true )
                 {
+                    mibReq.Type = MIB_DEVICE_CLASS;
+                    LoRaMacMibGetRequestConfirm( &mibReq );
+
+                    if( mibReq.Param.Class!= CLASS_C )
+                    {
+                        mibReq.Param.Class = CLASS_C;
+                        LoRaMacMibSetRequestConfirm( &mibReq );
+                    }
+
                     PrepareTxFrame( AppPort );
 
                     NextTx = SendFrame( );
diff --git a/src/apps/LoRaMac/classC/NucleoL476/main.c b/src/apps/LoRaMac/classC/NucleoL476/main.c
index b6f749200..350178d0f 100644
--- a/src/apps/LoRaMac/classC/NucleoL476/main.c
+++ b/src/apps/LoRaMac/classC/NucleoL476/main.c
@@ -1071,10 +1071,6 @@ int main( void )
                 mibReq.Param.SystemMaxRxError = 20;
                 LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mibReq.Type = MIB_DEVICE_CLASS;
-                mibReq.Param.Class = CLASS_C;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
                 LoRaMacStart( );
 
                 mibReq.Type = MIB_NETWORK_ACTIVATION;
@@ -1145,6 +1141,15 @@ int main( void )
             {
                 if( NextTx == true )
                 {
+                    mibReq.Type = MIB_DEVICE_CLASS;
+                    LoRaMacMibGetRequestConfirm( &mibReq );
+
+                    if( mibReq.Param.Class!= CLASS_C )
+                    {
+                        mibReq.Param.Class = CLASS_C;
+                        LoRaMacMibSetRequestConfirm( &mibReq );
+                    }
+
                     PrepareTxFrame( AppPort );
 
                     NextTx = SendFrame( );
diff --git a/src/apps/LoRaMac/classC/SAML21/main.c b/src/apps/LoRaMac/classC/SAML21/main.c
index c29f694e8..9a488bde6 100644
--- a/src/apps/LoRaMac/classC/SAML21/main.c
+++ b/src/apps/LoRaMac/classC/SAML21/main.c
@@ -1098,10 +1098,6 @@ int main( void )
                 mibReq.Param.SystemMaxRxError = 20;
                 LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mibReq.Type = MIB_DEVICE_CLASS;
-                mibReq.Param.Class = CLASS_C;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
                 LoRaMacStart( );
 
                 mibReq.Type = MIB_NETWORK_ACTIVATION;
@@ -1172,6 +1168,15 @@ int main( void )
             {
                 if( NextTx == true )
                 {
+                    mibReq.Type = MIB_DEVICE_CLASS;
+                    LoRaMacMibGetRequestConfirm( &mibReq );
+
+                    if( mibReq.Param.Class!= CLASS_C )
+                    {
+                        mibReq.Param.Class = CLASS_C;
+                        LoRaMacMibSetRequestConfirm( &mibReq );
+                    }
+
                     PrepareTxFrame( AppPort );
 
                     NextTx = SendFrame( );
diff --git a/src/apps/LoRaMac/classC/SKiM880B/main.c b/src/apps/LoRaMac/classC/SKiM880B/main.c
index 850c4b43f..f6f57da2f 100644
--- a/src/apps/LoRaMac/classC/SKiM880B/main.c
+++ b/src/apps/LoRaMac/classC/SKiM880B/main.c
@@ -1087,10 +1087,6 @@ int main( void )
                 mibReq.Param.SystemMaxRxError = 20;
                 LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mibReq.Type = MIB_DEVICE_CLASS;
-                mibReq.Param.Class = CLASS_C;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
                 LoRaMacStart( );
 
                 mibReq.Type = MIB_NETWORK_ACTIVATION;
@@ -1161,6 +1157,15 @@ int main( void )
             {
                 if( NextTx == true )
                 {
+                    mibReq.Type = MIB_DEVICE_CLASS;
+                    LoRaMacMibGetRequestConfirm( &mibReq );
+
+                    if( mibReq.Param.Class!= CLASS_C )
+                    {
+                        mibReq.Param.Class = CLASS_C;
+                        LoRaMacMibSetRequestConfirm( &mibReq );
+                    }
+
                     PrepareTxFrame( AppPort );
 
                     NextTx = SendFrame( );
diff --git a/src/apps/LoRaMac/classC/SKiM881AXL/main.c b/src/apps/LoRaMac/classC/SKiM881AXL/main.c
index b548683de..b02a1c3bb 100644
--- a/src/apps/LoRaMac/classC/SKiM881AXL/main.c
+++ b/src/apps/LoRaMac/classC/SKiM881AXL/main.c
@@ -1087,10 +1087,6 @@ int main( void )
                 mibReq.Param.SystemMaxRxError = 20;
                 LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mibReq.Type = MIB_DEVICE_CLASS;
-                mibReq.Param.Class = CLASS_C;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
                 LoRaMacStart( );
 
                 mibReq.Type = MIB_NETWORK_ACTIVATION;
@@ -1161,6 +1157,15 @@ int main( void )
             {
                 if( NextTx == true )
                 {
+                    mibReq.Type = MIB_DEVICE_CLASS;
+                    LoRaMacMibGetRequestConfirm( &mibReq );
+
+                    if( mibReq.Param.Class!= CLASS_C )
+                    {
+                        mibReq.Param.Class = CLASS_C;
+                        LoRaMacMibSetRequestConfirm( &mibReq );
+                    }
+
                     PrepareTxFrame( AppPort );
 
                     NextTx = SendFrame( );
diff --git a/src/apps/LoRaMac/classC/SKiM980A/main.c b/src/apps/LoRaMac/classC/SKiM980A/main.c
index c615f0752..38d4362f0 100644
--- a/src/apps/LoRaMac/classC/SKiM980A/main.c
+++ b/src/apps/LoRaMac/classC/SKiM980A/main.c
@@ -1087,10 +1087,6 @@ int main( void )
                 mibReq.Param.SystemMaxRxError = 20;
                 LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mibReq.Type = MIB_DEVICE_CLASS;
-                mibReq.Param.Class = CLASS_C;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
                 LoRaMacStart( );
 
                 mibReq.Type = MIB_NETWORK_ACTIVATION;
@@ -1161,6 +1157,15 @@ int main( void )
             {
                 if( NextTx == true )
                 {
+                    mibReq.Type = MIB_DEVICE_CLASS;
+                    LoRaMacMibGetRequestConfirm( &mibReq );
+
+                    if( mibReq.Param.Class!= CLASS_C )
+                    {
+                        mibReq.Param.Class = CLASS_C;
+                        LoRaMacMibSetRequestConfirm( &mibReq );
+                    }
+
                     PrepareTxFrame( AppPort );
 
                     NextTx = SendFrame( );