Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rc65ad0538ff99c3e13d7d7866ac15e38a1ef6002 -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c65ad0538ff99c3e13d7d7866ac15e38a1ef6002)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -33,11 +33,13 @@
 #include "ModeInitPOST.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"
@@ -72,6 +74,15 @@
 
 // MSG_ID_HD_UI_VERSION_INFO_REQUEST
 BOOL sendUIVersionRequest( void );
+
+// 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_DG_VERSION
 void handleDGVersionResponse( MESSAGE_T *message );
@@ -176,6 +187,9 @@
 // MSG_ID_TREATMENT_PARAM_CHANGE_RANGES
 BOOL sendTreatmentParamsRangesToUI( U32 minTime, U32 maxTime, F32 minUFVol, F32 maxUFVol, U32 minDialRate, U32 maxDialRate );
 
+// MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA
+BOOL sendTreatmentPeriodicDataToUI( TREATMENT_LOG_DATA_PERIODIC_T * periodDataPtr );
+
 // MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST
 void handleChangeBloodDialysateRateChangeRequest( MESSAGE_T *message );
 
@@ -278,6 +292,39 @@
 // 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 );
+
+// MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE
+BOOL sendActiveAlarmsList( BOOL accepted, U32 reason, U32 *alarmList, U32 size );
+
+// MSG_ID_HD_TREATMENT_LOG_ALARM_EVENT
+BOOL sendTreatmentLogAlarmEventData( ALARM_ID_T alarmID, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
+
+// MSG_ID_HD_TREATMENT_LOG_EVENT
+BOOL sendTreatmentLogEventData( EVENT_ID_T event, F32 oldValue, F32 newValue );
+
 // *********** public DG command functions **********
 
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
@@ -313,6 +360,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
@@ -327,9 +383,6 @@
 // MSG_ID_ALARM_TRIGGERED
 BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
 
-// MSG_ID_ALARM_CONDITION_CLEARED
-BOOL broadcastAlarmConditionCleared( U32 alarm );
-
 // MSG_ID_ALARM_CLEARED
 BOOL broadcastAlarmCleared( U32 alarm );
 
@@ -417,6 +470,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 );
 
@@ -645,6 +704,15 @@
 // MSG_ID_HD_RINSEBACK_SAFETY_VOLUME_OVERRIDE
 void handleRinsebackSafetyVolumeOverrideRequest( 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 );
+
 // MSG_ID_SUPER_CLEAR_ALARMS_CMD
 void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
 
@@ -696,6 +764,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 );