Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rdbfeaf78c05fc922eba6ff8c7a31ba8a9392c642 -r3f2b9de757500da37e0ed8881e4e906d94f3076c
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision dbfeaf78c05fc922eba6ff8c7a31ba8a9392c642)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3f2b9de757500da37e0ed8881e4e906d94f3076c)
@@ -32,11 +32,13 @@
 #include "Prime.h"
 #include "ModePostTreat.h"
 #include "ModePreTreat.h"
+#include "ModeStandby.h"
 #include "ModeTreatment.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "PresOccl.h"
 #include "Rinseback.h"
+#include "Switches.h"
 #include "SyringePump.h"
 #include "Valves.h"
 #include "Voltages.h"
@@ -64,7 +66,16 @@
 void handleUICheckIn( MESSAGE_T *message );
 
 // MSG_ID_REQUEST_FW_VERSIONS
-void handleFWVersionRequest( MESSAGE_T *message );
+void handleFWVersionRequest( MESSAGE_T *message );
+
+// MSG_ID_REQUEST_FW_VERSIONS
+void handleHDSerialNumberRequest( void );
+
+// MSG_ID_UI_REQUEST_SERVICE_INFO
+void handleHDServiceScheduleRequest( MESSAGE_T *message );
+
+// MSG_ID_REQUEST_HD_USAGE_INFO
+void handleHDUsageInfoRequest( MESSAGE_T *message );
 
 // MSG_ID_OFF_BUTTON_PRESS
 BOOL sendOffButtonMsgToUI( U08 cmd );
@@ -268,6 +279,27 @@
 // MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE
 BOOL sendTreatmentLogData( BOOL accepted, U32 reason, TREATMENT_LOG_DATA_PAYLOAD_T *logDataPtr );
 
+// MSG_ID_UI_DISINFECT_REQUEST
+void handleUIDisinfectRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_DISINFECT_RESPONSE
+BOOL sendDisinfectConfirmResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST
+void handleSetHDStandbyDisinfectSubmodeRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE
+BOOL handleSetHDStandbyDisinfectSubmodeResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_DG_FLUSH_DATA
+void handleFlushUIStateReadingFromDG( MESSAGE_T *message );
+
+// MSG_ID_DG_HEAT_DISINFECT_DATA
+void handleHeatDisinfectUIStateReadingFromDG( MESSAGE_T *message );
+
+// MSG_ID_DG_CHEM_DISINFECT_DATA
+void handleChemDisinfectUIStateReadingFromDG( MESSAGE_T *message );
+
 // MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST
 void handleUIActiveAlarmsListRequest( MESSAGE_T *message );
 
@@ -315,6 +347,15 @@
 // MSG_ID_DG_OP_MODE
 void handleDGOpMode( MESSAGE_T *message );
 
+// MSG_ID_DG_START_STOP_FLUSH
+BOOL sendDGStartFlushModeCommand( BOOL start );
+
+// MSG_ID_DG_START_STOP_HEAT_DISINFECT
+BOOL sendDGStartHeatDisinfectModeCommand( BOOL start );
+
+// MSG_ID_DG_START_STOP_CHEM_DISINFECT
+BOOL sendDGStartChemicalDisinfectModeCommand( BOOL start );
+
 // *********** public data broad cast functions **********
 
 // MSG_ID_HD_ACCELEROMETER_DATA
@@ -416,6 +457,12 @@
 // MSG_ID_HD_PRIMING_STATUS_DATA
 BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr );
 
+// MSG_ID_HD_DISINFECT_STANDBY_DATA
+BOOL broadcastDisinfectsData( DISINFECTS_DATA_T *disinfectsData );
+
+// MSG_ID_HD_SWITCHES_DATA
+BOOL broadcastSwitchesData( SWITCHES_DATA_T *switchesData );
+
 // MSG_ID_HD_SEND_CALIBRATION_RECORD
 BOOL sendHDCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress );
 
@@ -632,6 +679,12 @@
 // MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST
 void handleBubbleSelfTestRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_SWITCHES_STATUS_OVERRIDE
+void handleSetSwitchesStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE
+void handleTestSwitchesPublishIntervalOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE
 void handleBatteryRemainingPercentOverrideRequest( MESSAGE_T *message );
 
@@ -686,6 +739,12 @@
 // MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE:
 void handleTestSyringePumpMeasuredVolumeOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_VALVES_CURRENT_OVERRIDE
+void handleTestValvesCurrentOverrideRequest( MESSAGE_T *message );
+
+// MSD_ID_HD_VALVES_POSITION_COUNT_OVERRIDE
+void handleTestValvesPositionCountOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE
 void handleTestMonitoredVoltagesSendIntervalOverrideRequest( MESSAGE_T *message );