Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r00b32a5dad2e136d31cfaf0de16f7767b9920fec -r28b5f2e7f757647145a82a39aca0a5f3652c68a1
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 00b32a5dad2e136d31cfaf0de16f7767b9920fec)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 28b5f2e7f757647145a82a39aca0a5f3652c68a1)
@@ -21,8 +21,14 @@
 #include "DGCommon.h"
 #include "DrainPump.h"
 #include "Fans.h"
+#include "FluidLeak.h"
+#include "Heaters.h"
+#include "ModeHeatDisinfect.h"
 #include "MsgQueues.h"
+#include "NVDataMgmt.h"
+#include "Reservoirs.h"
 #include "ROPump.h"
+#include "TemperatureSensors.h"
 #include "Thermistors.h"
 #include "UVReactors.h"
 
@@ -42,11 +48,14 @@
 BOOL sendACKMsg( MESSAGE_T *message );
 
 // MSG_ID_ALARM_TRIGGERED
-BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
+BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
 
 // MSG_ID_ALARM_CLEARED
-BOOL broadcastAlarmCleared( U16 alarm );
+BOOL broadcastAlarmCleared( U32 alarm );
 
+// MSG_ID_ALARM_CONDITION_CLEARED
+BOOL broadcastAlarmConditionCleared( U32 alarm );
+
 // MSG_ID_DG_ACCELEROMETER_DATA
 BOOL broadcastAccelData( F32 x, F32 y, F32 z, F32 xm, F32 ym, F32 zm, F32 xt, F32 yt, F32 zt );
 
@@ -78,10 +87,10 @@
 BOOL broadcastReservoirData( U32 resID, U32 fillToVol, U32 drainToVol );
 
 // MSG_ID_HEATERS_READINGS
-BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC );
+BOOL broadcastHeatersData( HEATERS_DATA_T *heatersData );
 
 // MSG_ID_TEMPERATURE_SENSORS_READINGS
-BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength );
+BOOL broadcastTemperatureSensorsData( TEMPERATURE_SENSORS_DATA_T* tempSensorsData );
 
 // MSG_ID_DG_CONDUCTIVITY_DATA
 BOOL broadcastConductivityData( void * conductivityDataPtr );
@@ -92,22 +101,40 @@
 // MSG_ID_DG_FANS_DATA
 BOOL broadcastFansData( FANS_DATA_T * fansData );
 
+// MSG_ID_DG_UV_REACTORS_DATA
+BOOL broadcastUVReactorsData( UV_REACTORS_DATA_T *uvReactorsData );
+
+// MSG_ID_DG_FILTER_FLUSH_PROGRESS
+BOOL broadcastFilterFlushData( U32 timeout, U32 countdown );
+
+// MSG_ID_DG_FLUID_LEAK_STATE
+BOOL broadcastFluidLeakState( FLUID_LEAK_STATES_T state);
+
+// MSG_ID_DG_COMMAND_RESPONSE
+void sendCommandResponseMsg( DG_CMD_RESPONSE_T *cmdResponsePtr );
+
 // MSG_ID_POWER_OFF_WARNING
 void handlePowerOffWarning( MESSAGE_T *message );
 
+// MSG_ID_ALARM_CLEARED
+void handleAlarmClear( 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
+// MSG_ID_DG_SWITCH_RESERVOIR_CMD
 void handleSwitchReservoirCmd( MESSAGE_T *message );
 
-// MSG_ID_DG_FILL
+// MSG_ID_DG_CHANGE_VALVE_SETTING_CMD
+void handleChangeValveSettingCmd( MESSAGE_T *message );
+
+// MSG_ID_DG_FILL_CMD
 void handleFillCmd( MESSAGE_T *message );
 
-// MSG_ID_DG_DRAIN
+// MSG_ID_DG_DRAIN_CMD
 void handleDrainCmd( MESSAGE_T *message );
 
 // MSG_ID_STARTING_STOPPING_TREATMENT
@@ -125,6 +152,21 @@
 // MSG_ID_DG_UV_REACTORS_DATA
 BOOL broadcastUVReactorsData( UV_REACTORS_DATA_T *uvReactorsData );
 
+// MSG_ID_DG_HEAT_DISINFECT_DATA
+BOOL broadcastHeatDisinfectData( MODE_HEAT_DISINFECT_DATA_T *heatDisinfectData );
+
+// MSG_ID_DG_SEND_CALIBRATION_DATA
+BOOL sendDGCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress );
+
+// MSG_ID_DG_SEND_SYSTEM_RECORD
+BOOL sendDGSystemRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress );
+
+// MSG_ID_DG_SEND_SERVICE_RECORD
+BOOL sendDGServiceRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* srvcRcrdAddress );
+
+// MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD
+BOOL sendDGScheduledRunsRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* scheduledRcrdAddress );
+
 // *********** public test support message functions **********
 
 #ifdef DEBUG_ENABLED
@@ -208,15 +250,18 @@
 // MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE:
 void handleTestDGAccelBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_DG_ACCEL_SET_CALIBRATION:
-void handleSetAccelCalibration( MESSAGE_T *message );
-
 // MSG_ID_DG_START_STOP_INLET_UV_REACTOR
 void handleStartStopUVReactors( MESSAGE_T *message );
 
-//MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE
+// MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE
 void handleTestUVReactorsDataPublishIntervalOverride( MESSAGE_T *message );
 
+// MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE
+void handleSetFluidLeakBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE
+void handleSetFluidLeakStateDetectorOverrideRequest( MESSAGE_T *message);
+
 // MSG_ID_DG_SOFTWARE_RESET_REQUEST
 void handleDGSoftwareResetRequest( MESSAGE_T *message);
 
@@ -256,6 +301,33 @@
 // MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE
 void handleROPumpTargetPressureOverride( MESSAGE_T *message );
 
+// MSG_ID_DG_START_STOP_HEAT_DISINFECT
+BOOL handleStartStopDGHeatDisinfect( MESSAGE_T *message );
+
+// MSG_ID_DG_SET_CALIBRATION_DATA
+void handleSetDGCalibrationRecord( MESSAGE_T *message );
+
+// MSG_ID_DG_GET_CALIBRATION_RECORD
+void handleGetDGCalibrationRecord( MESSAGE_T *message );
+
+// MSG_ID_DG_SET_SYSTEM_DATA
+void handleSetDGSystemRecord( MESSAGE_T *message );
+
+// MSG_ID_DG_GET_SYSTEM_DATA
+void handleGetDGSystemRecord( MESSAGE_T *message );
+
+// MSG_ID_DG_GET_SERVICE_RECORD
+void handleGetDGServiceRecord( MESSAGE_T *message );
+
+// MSG_ID_DG_SET_SERVICE_RECORD
+void handleSetDGServiceRecord( MESSAGE_T *message );
+
+// MSG_ID_DG_GET_SCHEDULED_RUNS_RECORD
+void handleGetDGScheduledRunsRecord( MESSAGE_T *message );
+
+// MSG_ID_DG_SET_SCHEDULED_RUNS_RECORD
+void handleSetDGScheduledRunsRecord( MESSAGE_T *message );
+
 /**@}*/
 
 #endif