Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rfef7e8ec54aea7e7dc447b6240796013cc086604 -r07a5add2dff254f7be3699e4efac2b99d3554847
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision fef7e8ec54aea7e7dc447b6240796013cc086604)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 07a5add2dff254f7be3699e4efac2b99d3554847)
@@ -93,7 +93,9 @@
 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 };
 
+#ifdef ACK_IMPLEMENTED
 static PENDING_ACK_RECORD_T pendingAckList[ PENDING_ACK_LIST_SIZE ];    // list of outgoing messages that are awaiting an ACK
+#endif
 
 // DMA control records
 static g_dmaCTRL pcDMAXmitControlRecord;                // DMA transmit control record (UART-debug)
@@ -155,11 +157,13 @@
         badCRCTimeStamps[ i ] = 0;
     }
 
+#ifdef ACK_IMPLEMENTED
     // initialize pending ACK list
     for ( i = 0; i < PENDING_ACK_LIST_SIZE; i++ )
     {
         pendingAckList[ i ].used = FALSE;
     }
+#endif
 }
 
 /*************************************************************************
@@ -267,8 +271,10 @@
     // check for sub-system comm timeouts
     checkForCommTimeouts();
 
+#ifdef ACK_IMPLEMENTED
     // check ACK list for messages that need to be re-sent because they haven't been ACK'd
     checkPendingACKList();
+#endif
 }
 
 /*************************************************************************
@@ -784,12 +790,14 @@
             // TODO - check CRC before processing a message
             if ( message.crc == crc8( (U08*)(&message), sizeof(MESSAGE_HEADER_T) + message.msg.hdr.payloadLen ) )
             {
+#ifdef ACK_IMPLEMENTED
                 // if ACK,
                 if ( MSG_ID_ACK == message.msg.hdr.msgID )
                 {
                     matchACKtoPendingACKList( message.msg.hdr.seqNo );
                 }
                 else
+#endif
                 {
                     processReceivedMessage( &message.msg );
                 }
@@ -980,11 +988,13 @@
 {
     U16 msgID = message->hdr.msgID;
 
+#ifdef ACK_IMPLEMENTED
     // if received message requires ACK, queue one up
     if ( ( message->hdr.seqNo & MSG_ACK_BIT ) != 0 )
     {
         sendACKMsg( message );
     }
+#endif
 
     // handle any messages from other sub-systems
     switch ( msgID )
@@ -1080,34 +1090,58 @@
                 handleTestBloodPumpRotorMeasuredSpeedOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIAL_FLOW_SET_PT_OVERRIDE:
-                handleTestDialFlowSetPointOverrideRequest( message );
+            case MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE:
+                handleTestDialInFlowSetPointOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIAL_FLOW_MEAS_OVERRIDE:
-                handleTestDialFlowMeasuredOverrideRequest( message );
+            case MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE:
+                handleTestDialInFlowMeasuredOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIAL_PUMP_MC_MEAS_SPEED_OVERRIDE:
-                handleTestDialPumpMCMeasuredSpeedOverrideRequest( message );
+            case MSG_ID_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE:
+                handleTestDialInPumpMCMeasuredSpeedOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIAL_PUMP_MC_MEAS_CURR_OVERRIDE:
-                handleTestDialPumpMCMeasuredCurrentOverrideRequest( message );
+            case MSG_ID_DIAL_IN_PUMP_MC_MEAS_CURR_OVERRIDE:
+                handleTestDialInPumpMCMeasuredCurrentOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIAL_FLOW_SEND_INTERVAL_OVERRIDE:
-                handleTestDialFlowBroadcastIntervalOverrideRequest( message );
+            case MSG_ID_DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE:
+                handleTestDialInFlowBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIAL_PUMP_MEAS_SPEED_OVERRIDE:
-                handleTestDialPumpMeasuredSpeedOverrideRequest( message );
+            case MSG_ID_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE:
+                handleTestDialInPumpMeasuredSpeedOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIAL_PUMP_MEAS_ROTOR_SPEED_OVERRIDE:
-                handleTestDialPumpRotorMeasuredSpeedOverrideRequest( message );
+            case MSG_ID_DIAL_IN_PUMP_MEAS_ROTOR_SPEED_OVERRIDE:
+                handleTestDialInPumpRotorMeasuredSpeedOverrideRequest( message );
                 break;
 
+            case MSG_ID_PRESSURE_ARTERIAL_OVERRIDE:
+                handleTestArterialPressureOverrideRequest( message );
+                break;
+
+            case MSG_ID_PRESSURE_VENOUS_OVERRIDE:
+                handleTestVenousPressureOverrideRequest( message );
+                break;
+
+            case MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE:
+                handleTestBloodPumpOcclusionOverrideRequest( message );
+                break;
+
+            case MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE:
+                handleTestDialysateInletPumpOcclusionOverrideRequest( message );
+                break;
+
+            case MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE:
+                handleTestDialysateOutletPumpOcclusionOverrideRequest( message );
+                break;
+
+            case MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE:
+                handleTestPresOcclBroadcastIntervalOverrideRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;