Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r6cd114c4deffb81e85c6cd3ebaf550fe4661efda -r3f2b9de757500da37e0ed8881e4e906d94f3076c
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6cd114c4deffb81e85c6cd3ebaf550fe4661efda)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3f2b9de757500da37e0ed8881e4e906d94f3076c)
@@ -22,6 +22,7 @@
 #include "BloodFlow.h"
 #include "BloodLeak.h"
 #include "BloodPrime.h"
+#include "Bubble.h"
 #include "DGInterface.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
@@ -31,13 +32,16 @@
 #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"
 
 /**
  *  @defgroup SystemCommMessages SystemCommMessages
@@ -62,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 );
@@ -80,6 +93,18 @@
 // MSG_ID_ALARM_CONDITION_CLEARED
 void handleAlarmUserAction( MESSAGE_T *message );
 
+// MSG_ID_HD_POST_SINGLE_TEST_RESULT
+BOOL sendPOSTTestResult( HD_POST_STATE_T test, BOOL passed );
+
+// MSG_ID_HD_POST_FINAL_TEST_RESULT
+BOOL sendPOSTFinalResult( BOOL passed );
+
+// MSG_ID_DG_POST_FINAL_TEST_RESULT
+void handleDGPOSTFinalResult( MESSAGE_T *message );
+
+// MSG_ID_UI_POST_FINAL_TEST_RESULT
+void handleUIPOSTFinalResult( MESSAGE_T *message );
+
 // MSG_ID_LOAD_CELL_READINGS
 void handleLoadCellReadingsFromDG( MESSAGE_T *message );
 
@@ -149,6 +174,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 );
 
@@ -173,6 +201,12 @@
 // MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE
 BOOL sendHeparinCommandResponse( U32 accepted, U32 rejReason );
 
+// MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD
+void handleAlarmAudioVolumeSetCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE
+BOOL sendAlarmAudioVolumeSetResponse( U32 accepted, U32 rejReason );
+
 // MSG_ID_UI_SAMPLE_WATER_CMD
 void handleSampleWaterCmd( MESSAGE_T *message );
 
@@ -245,6 +279,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
@@ -273,24 +340,36 @@
 
 // MSG_ID_DG_COMMAND_RESPONSE
 void handleDGCmdResp( MESSAGE_T *messagePtr );
+
+// MSG_ID_UI_HD_SET_RTC_REQUEST:
+void handleUIClockSyncRequest( MESSAGE_T *message );
 
 // 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
 BOOL broadcastAccelData( F32 x, F32 y, F32 z, F32 xm, F32 ym, F32 zm, F32 xt, F32 yt, F32 zt );
 
 // MSG_ID_ALARM_STATUS
-BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
+BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
+
+// MSG_ID_HD_ALARM_INFORMATION
+BOOL broadcastAlarmInfo( ALARM_INFO_PAYLOAD_T data );
 
 // 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 );
 
@@ -314,6 +393,9 @@
 
 // MSG_ID_PRESSURE_OCCLUSION_DATA
 BOOL broadcastPresOcclData( PRESSURE_OCCLUSION_DATA_T data );
+
+// MSG_ID_HD_VOLTAGES_DATA
+BOOL broadcastVoltagesData( VOLTAGES_DATA_PAYLOAD_T data );
 
 // MSG_ID_RTC_EPOCH
 BOOL broadcastRTCEpoch( U32 epoch );
@@ -369,9 +451,18 @@
 // MSG_ID_HD_BLOOD_LEAK_DATA
 BOOL broadcastBloodLeakData( BLOOD_LEAK_STATUS_T status, U32 state );
 
+// MSG_ID_HD_BUBBLES_DATA
+BOOL broadcastBubblesData( U32 statusADA, U32 stateADA, U32 statusADV, U32 stateADV );
+
 // 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 );
 
@@ -546,9 +637,6 @@
 void handleSetHDValvePWMOverrideRequest( MESSAGE_T *message );
 #endif
 
-// MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER
-void handleTestSetTreatmentParameter( MESSAGE_T *message );
-
 // MSG_ID_HD_SOFTWARE_RESET_REQUEST
 void handleHDSoftwareResetRequest( MESSAGE_T *message );
 
@@ -582,6 +670,24 @@
 // MSG_ID_HD_BLOOD_LEAK_ZERO_REQUEST
 void handleBloodLeakZeroRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_BUBBLES_DATA_SEND_INTERVAL_OVERRIDE
+void handleSetBubblesDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_BUBBLE_STATUS_OVERRIDE
+void handleSetBubbleStatusOverrideRequest( MESSAGE_T *message );
+
+// 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 );
+
 // MSG_ID_SUPER_CLEAR_ALARMS_CMD
 void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
 
@@ -633,6 +739,45 @@
 // 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 );
+
+// MSG_ID_HD_MONITORED_VOLTAGES_OVERRIDE
+void handleTestMonitoredVoltageOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_INFO_SEND_INTERVAL_OVERRIDE
+void handleTestAlarmInfoSendIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_AUDIO_VOLUME_LEVEL_OVERRIDE
+void handleTestAlarmAudioVolumeOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_AUDIO_CURRENT_HG_OVERRIDE
+void handleTestAlarmAudioCurrentHgOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_AUDIO_CURRENT_LG_OVERRIDE
+void handleTestAlarmAudioCurrentLgOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ALARM_BACKUP_AUDIO_CURRENT_OVERRIDE
+void handleTestAlarmBackupAudioCurrentOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_STATUS_OVERRIDE
+void handleTestSyringePumpStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE
+void handleTestSyringePumpEncoderStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE
+void handleTestSyringePumpADCandDACStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE
+void handleTestSyringePumpADCReadCtrOverrideRequest( MESSAGE_T *message );
+
 /**@}*/
 
 #endif