Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r57007cd9fc64466a979f6613763a243d77743117 -ra504d6899e709d7432af9c055db1bd1fe340d032
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 57007cd9fc64466a979f6613763a243d77743117)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a504d6899e709d7432af9c055db1bd1fe340d032)
@@ -35,9 +35,54 @@
 // MSG_ID_RTC_EPOCH
 BOOL broadcastRTCEpoch( U32 epoch );  // TODO - probably don't want DG to broadcast these
 
+// MSG_ID_DG_OP_MODE
+BOOL broadcastDGOperationMode( U32 mode, U32 subMode );
+
 // MSG_ID_LOAD_CELL_READINGS
 BOOL broadcastLoadCellData( F32 loadCellA1, F32 loadCellA2, F32 loadCellB1, F32 loadCellB2 );
 
+// MSG_ID_DG_VALVES_STATES
+BOOL broadcastValvesStates( U16 valvesStates );
+
+// MSG_ID_RO_PUMP_DATA
+BOOL broadcastROPumpData( U32 tgtPressure, F32 measFlow, F32 setPWM );
+
+// MSG_ID_DRAIN_PUMP_DATA
+BOOL broadcastDrainPumpData( U32 tgtSpeed, U32 dac );
+
+// MSG_ID_DG_PRESSURES_DATA
+BOOL broadcastPressureSensorsData( F32 measROIn, F32 measROOut, F32 measDrainIn, F32 measDrainOut );
+
+// MSG_ID_DG_RESERVOIR_DATA
+BOOL broadcastReservoirData( U32 resID, U32 fillToVol, U32 drainToVol );
+
+// MSG_ID_POWER_OFF_WARNING
+void handlePowerOffWarning( MESSAGE_T *message );
+
+// MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
+void handleSetDialysateTemperatureCmd( MESSAGE_T *message );
+
+// MSG_ID_REQUEST_FW_VERSIONS
+void handleFWVersionCmd( MESSAGE_T *message );
+
+// MSG_ID_DG_SWITCH_RESERVOIR
+void handleSwitchReservoirCmd( MESSAGE_T *message );
+
+// MSG_ID_DG_FILL
+void handleFillCmd( MESSAGE_T *message );
+
+// MSG_ID_DG_DRAIN
+void handleDrainCmd( MESSAGE_T *message );
+
+// MSG_ID_STARTING_STOPPING_TREATMENT
+void handleStartStopTreatmentMsg( MESSAGE_T *message );
+
+// MSG_ID_DG_SAMPLE_WATER_CMD
+void handleSampleWaterCmd( MESSAGE_T *message );
+
+// MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
+void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message );
+
 // MSG_ID_HEATERS_READINGS
 BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC );
 
@@ -55,18 +100,18 @@
 void handleTesterLogInRequest( MESSAGE_T *message );
 BOOL isTestingActivated( void );
 
-// MSG_ID_DG_MESSAGE
-void handleTestDGMessageRequest( MESSAGE_T *message );
+// MSG_ID_DG_ALARM_STATE_OVERRIDE
+void handleTestAlarmStateOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE:
 void handleTestWatchdogCheckInStateOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_ALARM_STATE_OVERRIDE
-void handleTestAlarmStateOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_LOAD_CELL_OVERRIDE
 void handleTestLoadCellOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE:
+void handleTestLoadCellDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_TEMPERATURE_SENSORS_OVERRIDE
 void handleTestTemperatureSensorsOverrideRequest ( MESSAGE_T *message );
 
@@ -76,8 +121,42 @@
 // MSG_ID_SET_RTC_TIMESTAMP
 void handleSetRTCTimestamp( MESSAGE_T *message );
 
+// MSG_ID_PRESSURE_OVERRIDE:
+void handleTestPressureSensorOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
+void handleTestPressureDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_RO_PUMP_SET_PT_OVERRIDE:
+void handleTestROPumpSetPointOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
+void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
+void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE:
+void handleTestDrainPumpSetPointOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
+void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_VALVE_STATE_OVERRIDE
+void handleTestValveStateOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE
+void handleTestValvesStatesPublishIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE:
+void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message );
+
+#ifdef CAN_TEST
+// MSG_ID_DG_CAN_TEST_1_LARGE_FREQ
+void broadcastCANTest1LargeFrequentMessage();
+#endif
+
 // MSG_ID_START_STOP_PRIMARY_HEATER
 BOOL handleStartStopPrimaryHeater( MESSAGE_T * message );
 
 #endif
-