Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6b6b337c1c0e7dd7c1b7311a39596473d7214ee4 -r6c801cb0b32cba0e754cb6b1b57c1a8bd4e2bcf7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6b6b337c1c0e7dd7c1b7311a39596473d7214ee4)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6c801cb0b32cba0e754cb6b1b57c1a8bd4e2bcf7)
@@ -34,9 +34,9 @@
 
 // ********** private definitions **********
 
-#define NUM_OF_CAN_OUT_BUFFERS          4       // # of CAN buffers for transmit
-#define NUM_OF_CAN_IN_BUFFERS           6       // # of CAN buffers for receiving
-#define NUM_OF_MSG_IN_BUFFERS           7       // # of Msg buffers for receiving
+#define NUM_OF_CAN_OUT_BUFFERS          5       // # of CAN buffers for transmit
+#define NUM_OF_CAN_IN_BUFFERS           7       // # of CAN buffers for receiving
+#define NUM_OF_MSG_IN_BUFFERS           8       // # of Msg buffers for receiving - 1 is UART
 
 #define SCI1_RECEIVE_DMA_REQUEST        30
 #define SCI1_TRANSMIT_DMA_REQUEST       31
@@ -48,7 +48,8 @@
     COMM_BUFFER_OUT_CAN_HD_ALARM,
     COMM_BUFFER_OUT_CAN_HD_2_DG,
     COMM_BUFFER_OUT_CAN_HD_2_UI,
-    COMM_BUFFER_OUT_CAN_HD_BROADCAST
+    COMM_BUFFER_OUT_CAN_HD_BROADCAST,
+    COMM_BUFFER_OUT_CAN_PC
 };
 
 const COMM_BUFFER_T MSG_IN_BUFFERS[NUM_OF_MSG_IN_BUFFERS] =
@@ -59,10 +60,11 @@
     COMM_BUFFER_IN_CAN_DG_BROADCAST,
     COMM_BUFFER_IN_CAN_UI_2_HD,
     COMM_BUFFER_IN_CAN_UI_BROADCAST,
+    COMM_BUFFER_IN_CAN_PC,
     COMM_BUFFER_IN_UART_PC
 };
 
-static U08 pcXmitPacket[PC_MESSAGE_PACKET_SIZE] = {0,0,0,0,0,0,0,0};// = {1,2,3,4,5,6,7,8};
+static U08 pcXmitPacket[PC_MESSAGE_PACKET_SIZE] = {0,0,0,0,0,0,0,0};
 static U08 pcRecvPacket[PC_MESSAGE_PACKET_SIZE] = {0,0,0,0,0,0,0,0};
 
 // DMA control records
@@ -98,11 +100,6 @@
 {
     // initialize UART and DMA for PC communication
     initUARTAndDMA();
-
-    // TODO - remove this test code that sends a packet
-//    dmaSetCtrlPacket( DMA_CH3, pcDMAXmitControlRecord );
-//    dmaSetChEnable( DMA_CH3, DMA_HW );
-//    setSCI1DMATransmitInterrupt();
 }
 
 /*************************************************************************
@@ -644,7 +641,7 @@
     }
 
     // handle any test messages if tester has logged in successfully
-    if ( ( msgID > MSG_ID_FIRST_TESTER_MESSAGE ) && ( TRUE == isTestingActivated() ) )
+    if ( ( msgID > MSG_ID_FIRST_TESTER_MESSAGE ) && ( msgID < NUM_OF_MSG_IDS ) && ( TRUE == isTestingActivated() ) )
     {
         switch ( msgID )
         {
@@ -669,9 +666,13 @@
                 break;
 
             case MSG_ID_ALARM_STATE_OVERRIDE:
-                //handleTestAlarmStateOverrideRequest( message );
+                handleTestAlarmStateOverrideRequest( message );
                 break;
 
+            case MSG_ID_ALARM_START_OVERRIDE:
+                handleTestAlarmStartOverrideRequest( message );
+                break;
+
             case MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE:
                 handleTestBloodFlowSetPointOverrideRequest( message );
                 break;