Changed improved the way LmHanler handles the packages transmissions

Avoids conflicts between normal application uplinks and packages uplinks

Author: mluis1

src/apps/LoRaMac/common/LmHandler/LmHandler.c

@@ -225,6 +225,8 @@ typedef enum PackageNotifyTypes_e
  */
 static void LmHandlerPackagesNotify( PackageNotifyTypes_t notifyType, void *params );
 
+static bool LmHandlerPackageIsTxPending( void );
+
 static void LmHandlerPackagesProcess( void );
 
 LmHandlerErrorStatus_t LmHandlerInit( LmHandlerCallbacks_t *handlerCallbacks,
@@ -344,15 +346,9 @@ bool LmHandlerIsBusy( void )
         return true;
     }
 
-    for( int8_t i = 0; i < PKG_MAX_NUMBER; i++ )
+    if( LmHandlerPackageIsTxPending( ) == true )
     {
-        if( LmHandlerPackages[i] != NULL )
-        {
-            if( LmHandlerPackages[i]->IsTxPending( ) == true )
-            {
-                return true;
-            }
-        }
+        return true;
     }
 
     return false;
@@ -382,6 +378,13 @@ void LmHandlerProcess( void )
     // Call all packages process functions
     LmHandlerPackagesProcess( );
 
+    // Check if a package transmission is pending.
+    // If it is the case exit function earlier
+    if( LmHandlerPackageIsTxPending( ) == true )
+    {
+        return;
+    }
+
     // If a MAC layer scheduled uplink is still pending try to send it.
     if( IsUplinkTxPending == true )
     {
@@ -1014,6 +1017,21 @@ static void LmHandlerPackagesNotify( PackageNotifyTypes_t notifyType, void *para
     }
 }
 
+static bool LmHandlerPackageIsTxPending( void )
+{
+    for( int8_t i = 0; i < PKG_MAX_NUMBER; i++ )
+    {
+        if( LmHandlerPackages[i] != NULL )
+        {
+            if( LmHandlerPackages[i]->IsTxPending( ) == true )
+            {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
 static void LmHandlerPackagesProcess( void )
 {
     for( int8_t i = 0; i < PKG_MAX_NUMBER; i++ )

src/apps/LoRaMac/common/LmHandler/packages/LmhpCompliance.c

@@ -237,11 +237,9 @@ static void LmhpComplianceProcess( void )
 {
     if( ComplianceTestState.IsTxPending == true )
     {
-        if( TimerGetCurrentTime( ) > ( ComplianceTestState.TxPendingTimestamp + LmHandlerGetDutyCycleWaitTime( ) ) )
+        TimerTime_t now = TimerGetCurrentTime( );
+        if( now > ( ComplianceTestState.TxPendingTimestamp + LmHandlerGetDutyCycleWaitTime( ) ) )
         {
-            ComplianceTestState.IsTxPending = false;
-            ComplianceTestState.TxPendingTimestamp = TimerGetCurrentTime( );
-
             if( ComplianceTestState.DataBufferSize != 0 )
             {
                 // Answer commands
@@ -256,6 +254,11 @@ static void LmhpComplianceProcess( void )
                     // try to send the message again
                     ComplianceTestState.IsTxPending = true;
                 }
+                else
+                {
+                    ComplianceTestState.IsTxPending = false;
+                }
+                ComplianceTestState.TxPendingTimestamp = now;
             }
         }
     }
@@ -489,6 +492,11 @@ static void LmhpComplianceOnMcpsIndication( McpsIndication_t* mcpsIndication )
     {
         ComplianceTestState.IsTxPending = true;
     }
+    else
+    {
+        // Abort any pending Tx as a new command has been processed
+        ComplianceTestState.IsTxPending = false;
+    }
 }
 
 static void LmhpComplianceOnMlmeConfirm( MlmeConfirm_t *mlmeConfirm )