Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r9ce06772b2f651c57144327e6cbf886e2bc22dee -rebbb1f85550a1f9b8f946655f7b2b63f76fbf67d
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9ce06772b2f651c57144327e6cbf886e2bc22dee)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ebbb1f85550a1f9b8f946655f7b2b63f76fbf67d)
@@ -21,9 +21,11 @@
 #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 "Thermistors.h"
@@ -101,12 +103,21 @@
 // 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 );
 
@@ -143,6 +154,18 @@
 // 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
@@ -226,15 +249,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);
 
@@ -277,6 +303,30 @@
 // 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