Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r4d7d40a27130dc813d653f044cbb856b1b7d8481 -r6ec678e1c03a52564f5699986fe5d608f95cce79
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 4d7d40a27130dc813d653f044cbb856b1b7d8481)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 6ec678e1c03a52564f5699986fe5d608f95cce79)
@@ -29,9 +29,6 @@
 #include "TaskPriority.h"
 #include "TaskTimer.h"
 #include "Utilities.h"
-#ifdef DEBUG_ENABLED
-    #include "SystemCommMessages.h"
-#endif
 
 /**
  *  @addtogroup Interrupts
@@ -45,14 +42,6 @@
 
 // ********** private data **********
 
-#ifdef DEBUG_ENABLED
-    static U32 sci1FrameErrorCnt = 0;
-    static U32 sci1OverrunErrorCnt = 0;
-#endif
-static U32 sci2FrameErrorCnt;                                           ///< SCI2 frame error count.
-static U32 sci2OverrunErrorCnt;                                         ///< SCI2 overrun error count.
-
-static U32 can1PassiveCnt;                                              ///< CAN1 passive count.
 static U32 can1WarningCnt;                                              ///< CAN1 warning count.
 static U32 can1BusOffCnt;                                               ///< CAN1 bus offline count.
 static U32 can1ParityCnt;                                               ///< CAN1 parity count.
@@ -66,15 +55,11 @@
  *************************************************************************/
 void initInterrupts( void )
 {
-    sci2FrameErrorCnt   = 0;
-    sci2OverrunErrorCnt = 0;
-    can1PassiveCnt      = 0;
     can1WarningCnt      = 0;
     can1BusOffCnt       = 0;
     can1ParityCnt       = 0;
 
     // initialize various time windowed counts for monitoring CAN & UART errors and warnings
-    initTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_PASSIVE, MAX_COMM_ERRORS, COMM_ERROR_TIME_WINDOW_MS );
     initTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_OFF, MAX_COMM_ERRORS, COMM_ERROR_TIME_WINDOW_MS );
     initTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_PARITY, MAX_COMM_ERRORS, COMM_ERROR_TIME_WINDOW_MS );
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_UART_FRAME_ERROR, MAX_COMM_ERRORS, COMM_ERROR_TIME_WINDOW_MS );
@@ -91,15 +76,6 @@
 void phantomInterrupt( void )
 {
     // TODO - what to do with phantom interrupts?
-#ifdef DEBUG_ENABLED
-    {
-        char debugStr[ 50 ];
-
-        strcpy( debugStr, "DG-phantom interrupt\n" );
-        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-        sendDebugDataToUI( (U08*)debugStr );
-    }
-#endif
 }
 
 /*********************************************************************//**
@@ -168,140 +144,40 @@
  *************************************************************************/
 void canErrorNotification(canBASE_t *node, uint32 notification)
 {
-#ifdef DEBUG_ENABLED
-    char debugStr[ 256 ];
-#endif
-
     if ( node == canREG1 )
     {
+        // Parity error - message RAM is corrupted
         if ( notification & canLEVEL_PARITY_ERR )
         {
             can1ParityCnt++;
             if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_PARITY ) )
             {
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_CAN_PARITY_ERROR )
             }
-#ifdef DEBUG_ENABLED
-            sprintf( debugStr, "CAN parity error:%5d \n", can1ParityCnt );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-#endif
         }
+        // Bus off - our transmitter has counted 255+ errors
         else if ( notification & canLEVEL_BUS_OFF )
         {
             can1BusOffCnt++;
             if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_OFF ) )
             {
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_CAN_OFF_ERROR )
             }
-#ifdef DEBUG_ENABLED
-            sprintf( debugStr, "CAN bus off error:%5d \n", can1BusOffCnt );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-#endif
         }
+        // Warning - our transmitter has counted 96+ errors
         else if ( notification & canLEVEL_WARNING )
         {
             can1WarningCnt++;
-#ifdef DEBUG_ENABLED
-            sprintf( debugStr, "CAN bus warning:%5d \n", can1WarningCnt );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-#endif
         }
-        else if ( notification & canLEVEL_PASSIVE )
-        {
-            can1PassiveCnt++;
-            if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_PASSIVE ) )
-            {
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_CAN_PASSIVE_WARNING )
-            }
-#ifdef DEBUG_ENABLED
-            sprintf( debugStr, "CAN passive warning:%5d \n", can1PassiveCnt );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-#endif
-        }
         else
         {
-            // ignore - other notifications undefined
+            // Ignore - other notifications - unhandled
         }
     }
 }
 
 /*********************************************************************//**
  * @brief
- * The sciNotification function handles UART communication error interrupts.
- * Frame and Over-run errors are handled.
- * @details Inputs: none
- * @details Outputs: UART error interrupts handled.
- * @param sci pointer to the SCI peripheral that detected the error
- * @param flags error flag(s)
- * @return none
- *************************************************************************/
-void sciNotification(sciBASE_t *sci, uint32 flags)
-{
-#ifdef DEBUG_ENABLED
-    // TODO - temporary debug code - remove later
-    char debugStr[ 256 ];
-#endif
-
-    if ( sci == scilinREG )
-    {
-        if ( ( flags & SCI_FE_INT ) != 0 )
-        {
-            sci2FrameErrorCnt++;
-            clearSCI2CommErrors();
-            if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_UART_FRAME_ERROR ) )
-            {
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_UART_FRAME_ERROR )
-            }
-#ifdef DEBUG_ENABLED
-            sprintf( debugStr, "FPGA UART FR err:%5d \n", sci2FrameErrorCnt );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-#endif
-        }
-        if ( ( flags & SCI_OE_INT ) != 0 )
-        {
-            sci2OverrunErrorCnt++;
-            clearSCI2CommErrors();
-            if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_UART_OVERRUN ) )
-            {
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_UART_OVERRUN_ERROR )
-            }
-#ifdef DEBUG_ENABLED
-            sprintf( debugStr, "FPGA UART OR err:%5d \n", sci2OverrunErrorCnt );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-#endif
-        }
-    }
-#ifdef DEBUG_ENABLED
-    else if ( sci == sciREG )
-    {
-        if ( ( flags & SCI_FE_INT ) != 0 )
-        {
-            sci1FrameErrorCnt++;
-            clearSCI1CommErrors();
-            sprintf( debugStr, "Debug UART FR err:%5d \n", sci1FrameErrorCnt );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-        }
-        if ( ( flags & SCI_OE_INT ) != 0 )
-        {
-            sci1OverrunErrorCnt++;
-            clearSCI1CommErrors();
-            sprintf( debugStr, "Debug UART OR err:%5d \n", sci1OverrunErrorCnt );
-            sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            sendDebugDataToUI( (U08*)debugStr );
-        }
-    }
-#endif
-}
-
-/*********************************************************************//**
- * @brief
  * The dmaGroupANotification function handles communication DMA interrupts.
  * @details Inputs: none
  * @details Outputs: DMA interrupt is handled.