Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r98eaa905f2487013d5e9af76bf064f872332c2fe -r3eb7c2e62c727be195cd937d49957db9d4ba83b4
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 98eaa905f2487013d5e9af76bf064f872332c2fe)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3eb7c2e62c727be195cd937d49957db9d4ba83b4)
@@ -22,9 +22,14 @@
 #include "DrainPump.h"
 #include "Fans.h"
 #include "FluidLeak.h"
+#include "Heaters.h"
+#include "ModeFlush.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"
 
@@ -83,10 +88,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 );
@@ -100,15 +105,24 @@
 // 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_FLUSH_DATA
+BOOL broadcastFlushData( MODE_FLUSH_DATA_T *flushData );
+
 // 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 );
 
@@ -139,6 +153,24 @@
 // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
 void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message );
 
+// 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
@@ -222,9 +254,6 @@
 // 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 );
 
@@ -276,6 +305,36 @@
 // MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE
 void handleROPumpTargetPressureOverride( MESSAGE_T *message );
 
+// MSG_ID_DG_START_STOP_FLUSH
+BOOL handleStartStopDGFlush( 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