Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6311eb9b65fdeec7a285d25e07f3932ac0fb6cf1 -rab432aeb5e140e5b17b149f980063843fcb76290
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6311eb9b65fdeec7a285d25e07f3932ac0fb6cf1)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ab432aeb5e140e5b17b149f980063843fcb76290)
@@ -76,9 +76,6 @@
 static BOOL uiIsCommunicating = FALSE;              // has UI sent a message since last check
 static BOOL uiDidCommunicate = FALSE;               // has UI every sent a message
 
-static U32 sentCANPacketsCount = 0;  // TODO - debug - remove these two flags later
-static U32 compCANPacketsCount = 0;
-
 // ********** private function prototypes **********
 
 static void initUARTAndDMA( void );
@@ -253,21 +250,15 @@
     // message interrupt is for a transmit message box?
     if ( TRUE == isCANBoxForXmit( srcCANBox ) )
     {
-        U32 bytesXmitted;
-
-        compCANPacketsCount++;
         if ( FALSE == canIsTxMessagePending( canREG1, srcCANBox ) )
         {
-            bytesXmitted = transmitNextCANPacket();
+            U32 bytesXmitted = transmitNextCANPacket();
+
             if ( 0 == bytesXmitted )
             {
                 signalCANXmitsCompleted();
             }
         }
-        else
-        {
-            compCANPacketsCount--;
-        }
     }
     else if ( TRUE == isCANBoxForRecv( srcCANBox ) )
     {
@@ -507,17 +498,16 @@
         if ( dataSize == CAN_MESSAGE_PAYLOAD_SIZE )
         {
             signalCANXmitsInitiated();
-            if ( 0 == canTransmit( canREG1, mBox, data ) )
+            if ( 0 != canTransmit( canREG1, mBox, data ) )
             {
+                result = CAN_MESSAGE_PAYLOAD_SIZE;
+            }
+            else
+            {
                 signalCANXmitsCompleted();
                 // TODO - shouldn't get here, but let's see if we do
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, (U32)mBox )
             }
-            else
-            {
-                sentCANPacketsCount++;
-                result = CAN_MESSAGE_PAYLOAD_SIZE;
-            }
         }
         else
         {   // TODO - shouldn't get here - just testing - set first data to new s/w fault enum later