Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r57007cd9fc64466a979f6613763a243d77743117 -ra504d6899e709d7432af9c055db1bd1fe340d032
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 57007cd9fc64466a979f6613763a243d77743117)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a504d6899e709d7432af9c055db1bd1fe340d032)
@@ -29,10 +29,6 @@
 #include "Utilities.h"
 #include "SystemCommMessages.h"
 
-#ifdef RM46_EVAL_BOARD_TARGET
-    #include "CPLD.h"
-#endif
-
 // ********** private definitions **********
 
 #define NUM_OF_CAN_OUT_BUFFERS          4       // # of CAN buffers for transmit
@@ -649,7 +645,7 @@
                     // add new message to queue for later processing
                     addToMsgQueue( MSG_Q_IN, &rcvMsg );
                     // if message from HD broadcast channel, update HD comm status
-                    if ( COMM_BUFFER_IN_CAN_HD_BROADCAST == i )
+                    if ( COMM_BUFFER_IN_CAN_HD_BROADCAST == MSG_IN_BUFFERS[ i ] )
                     {
                         hdIsCommunicating = TRUE;
                         timeOfLastHDCheckIn = getMSTimerCount();
@@ -817,7 +813,9 @@
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
         hdIsCommunicating = FALSE;
-        //activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );  // TODO - add this alarm if we're in middle of a treatment? or if in a mode that comm loss would impact badly?
+#ifndef DEBUG_ENABLED
+        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );  // TODO - add this alarm if we're in middle of a treatment? or if in a mode that comm loss would impact badly?
+#endif
     }
 }
 
@@ -978,6 +976,42 @@
     // handle any messages from other sub-systems
     switch ( msgID )
     {
+        case MSG_ID_POWER_OFF_WARNING:
+            handlePowerOffWarning( message );
+            break;
+
+        case MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS:
+            handleSetDialysateTemperatureCmd( message );
+            break;
+
+        case MSG_ID_REQUEST_FW_VERSIONS:
+            handleFWVersionCmd( message );
+            break;
+
+        case MSG_ID_DG_SWITCH_RESERVOIR_CMD:
+            handleSwitchReservoirCmd( message );
+            break;
+
+        case MSG_ID_DG_FILL_CMD:
+            handleFillCmd( message );
+            break;
+
+        case MSG_ID_DG_DRAIN_CMD:
+            handleDrainCmd( message );
+            break;
+
+        case MSG_ID_STARTING_STOPPING_TREATMENT_CMD:
+            handleStartStopTreatmentMsg( message );
+            break;
+
+        case MSG_ID_DG_SAMPLE_WATER_CMD:
+            handleSampleWaterCmd( message );
+            break;
+
+        case MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD:
+            handleStartStopTrimmerHeaterCmd( message );
+            break;
+
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
             break;
@@ -992,14 +1026,14 @@
     {
         switch ( msgID )
         {
+            case MSG_ID_DG_ALARM_STATE_OVERRIDE:
+                handleTestAlarmStateOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE:
                 handleTestWatchdogCheckInStateOverrideRequest( message );
                 break;
 
-            case MSG_ID_ALARM_STATE_OVERRIDE:
-                handleTestAlarmStateOverrideRequest( message );
-                break;
-
             case MSG_ID_DG_SET_RTC_DATE_TIME:
                 handleSetRTCTimestamp( message );
                 break;
@@ -1012,6 +1046,49 @@
                 handleTestLoadCellOverrideRequest( message );
                 break;
 
+            case MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE:
+                handleTestLoadCellDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_PRESSURE_OVERRIDE:
+                handleTestPressureSensorOverrideRequest( message );
+                break;
+
+            case MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
+                handleTestPressureDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_RO_PUMP_SET_PT_OVERRIDE:
+                handleTestROPumpSetPointOverrideRequest( message );
+                break;
+
+            case MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
+                handleTestROMeasuredFlowOverrideRequest( message );
+                break;
+
+            case MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
+                handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE:
+                handleTestDrainPumpSetPointOverrideRequest( message );
+                break;
+
+            case MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
+                handleTestDrainPumpDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_VALVE_STATE_OVERRIDE:
+                handleTestValveStateOverrideRequest( message );
+                break;
+
+            case MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestValvesStatesPublishIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE:
+                handleTestDGSafetyShutdownOverrideRequest( message );
+
             case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE:
                 handleTestTemperatureSensorsOverrideRequest ( message );
                 break;