Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r3eb7c2e62c727be195cd937d49957db9d4ba83b4 -r2fff37fa585181917705645494549b5fd4a4d522
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3eb7c2e62c727be195cd937d49957db9d4ba83b4)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 2fff37fa585181917705645494549b5fd4a4d522)
@@ -23,6 +23,7 @@
 #include "Fans.h"
 #include "FluidLeak.h"
 #include "Heaters.h"
+#include "ModeChemicalDisinfect.h"
 #include "ModeFlush.h"
 #include "ModeHeatDisinfect.h"
 #include "MsgQueues.h"
@@ -32,6 +33,7 @@
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
 #include "UVReactors.h"
+#include "Voltages.h"
 
 /**
  *  @defgroup SystemCommMessages SystemCommMessages
@@ -105,15 +107,30 @@
 // 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_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_VOLTAGES_DATA
+BOOL broadcastVoltagesData( VOLTAGES_DATA_PAYLOAD_T data );
+
 // MSG_ID_DG_FLUSH_DATA
 BOOL broadcastFlushData( MODE_FLUSH_DATA_T *flushData );
 
+// MSG_ID_DG_CHEM_DISINFECT_DATA
+BOOL broadcastChemicalDisinfectData( MODE_CHEMICAL_DISINFECT_DATA_T *chemDisinfectData );
+
+// MSG_ID_DG_CHEM_DISINFECT_TIME_TO_UI_DATA_PUBLISH
+BOOL broadcastChemicalDisinfectData2UI( MODE_CHEMICAL_DISINFECT_UI_DATA_T *chemDisinfectUIData );
+
+// MSG_ID_DG_HEAT_DISINFECT_TO_UI_DATA_PUBLISH
+BOOL broadcastHeatDisinfectData2UI( MODE_HEAT_DISINFECT_UI_DATA_T *heatDisinfectUIData );
+
 // MSG_ID_DG_COMMAND_RESPONSE
 void sendCommandResponseMsg( DG_CMD_RESPONSE_T *cmdResponsePtr );
 
@@ -153,12 +170,6 @@
 // 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 );
 
@@ -171,6 +182,12 @@
 // MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD
 BOOL sendDGScheduledRunsRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* scheduledRcrdAddress );
 
+// MSG_ID_DG_POST_SINGLE_TEST_RESULT
+BOOL sendPOSTTestResult( DG_POST_STATE_T test, BOOL passed );
+
+// MSG_ID_DG_POST_FINAL_TEST_RESULT
+BOOL sendPOSTFinalResult( BOOL passed );
+
 // *********** public test support message functions **********
 
 #ifdef DEBUG_ENABLED
@@ -254,6 +271,12 @@
 // MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE:
 void handleTestDGAccelBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE
+void handleTestMonitoredVoltagesSendIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_MONITORED_VOLTAGES_OVERRIDE
+void handleTestMonitoredVoltageOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_START_STOP_INLET_UV_REACTOR
 void handleStartStopUVReactors( MESSAGE_T *message );
 
@@ -311,6 +334,9 @@
 // MSG_ID_DG_START_STOP_HEAT_DISINFECT
 BOOL handleStartStopDGHeatDisinfect( MESSAGE_T *message );
 
+// MSG_ID_UI_DG_SET_RTC_REQUEST
+void handleUIClockSyncRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_SET_CALIBRATION_DATA
 void handleSetDGCalibrationRecord( MESSAGE_T *message );
 
@@ -335,6 +361,12 @@
 // MSG_ID_DG_SET_SCHEDULED_RUNS_RECORD
 void handleSetDGScheduledRunsRecord( MESSAGE_T *message );
 
+// MSG_ID_DG_START_STOP_CHEM_DSINFECT
+BOOL handleStartStopDGChemicalDisinfect( MESSAGE_T *message );
+
+// MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE
+void handleFilterFlushTimePeriodOverride( MESSAGE_T *message );
+
 /**@}*/
 
 #endif