Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r5ea32b3039d77bda54cecc0740ccc489812b943d -r92138116199dca3bdefe4f8e872916ea805a5d3a
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5ea32b3039d77bda54cecc0740ccc489812b943d)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 92138116199dca3bdefe4f8e872916ea805a5d3a)
@@ -18,15 +18,17 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "HDCommon.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
 #include "BloodPrime.h"
 #include "DGInterface.h"
-#include "DialInFlow.h"
+#include "DialInFlow.h"
 #include "DialOutFlow.h"
-#include "Dialysis.h"
-#include "Prime.h"
+#include "Dialysis.h"
+#include "FluidLeak.h"
+#include "HDCommon.h"
+#include "Prime.h"
+#include "ModePostTreat.h"
 #include "ModePreTreat.h"
 #include "ModeTreatment.h"
 #include "MsgQueues.h"
@@ -35,6 +37,7 @@
 #include "Rinseback.h"
 #include "SyringePump.h"
 #include "Valves.h"
+#include "Voltages.h"
 
 /**
  *  @defgroup SystemCommMessages SystemCommMessages
@@ -170,24 +173,12 @@
 // MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE
 BOOL sendHeparinCommandResponse( U32 accepted, U32 rejReason );
 
-// MSG_ID_UI_RINSEBACK_CMD
-void handlRinsebackCmd( MESSAGE_T *message );
+// MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD
+void handleAlarmAudioVolumeSetCmd( MESSAGE_T *message );
 
-// MSG_ID_HD_RINSEBACK_CMD_RESPONSE
-BOOL sendRinsebackCmdResponse( BOOL accepted, U32 rejReason );
+// MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE
+BOOL sendAlarmAudioVolumeSetResponse( U32 accepted, U32 rejReason );
 
-// MSG_ID_UI_RECIRC_CMD
-void handleTreatmentRecircCmd( MESSAGE_T *message );
-
-// MSG_ID_HD_RECIRC_CMD_RESPONSE
-BOOL sendTreatmentRecircCmdResponse( BOOL accepted, U32 rejReason );
-
-// MSG_ID_UI_TX_END_CMD:
-void handleTreatmentEndCmd( MESSAGE_T *message );
-
-// MSG_ID_HD_RECIRC_CMD_RESPONSE
-BOOL sendTreatmentEndCmdResponse( BOOL accepted, U32 rejReason );
-
 // MSG_ID_UI_SAMPLE_WATER_CMD
 void handleSampleWaterCmd( MESSAGE_T *message );
 
@@ -227,6 +218,39 @@
 // MSG_ID_HD_START_TREATMENT_RESPONSE
 BOOL sendStartTreatmentResponse( BOOL accepted, U32 reason );
 
+// MSG_ID_UI_RINSEBACK_CMD
+void handlRinsebackCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_RINSEBACK_CMD_RESPONSE
+BOOL sendRinsebackCmdResponse( BOOL accepted, U32 rejReason );
+
+// MSG_ID_UI_RECIRC_CMD
+void handleTreatmentRecircCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_RECIRC_CMD_RESPONSE
+BOOL sendTreatmentRecircCmdResponse( BOOL accepted, U32 rejReason );
+
+// MSG_ID_UI_TX_END_CMD:
+void handleTreatmentEndCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_RECIRC_CMD_RESPONSE
+BOOL sendTreatmentEndCmdResponse( BOOL accepted, U32 rejReason );
+
+// MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM
+void handlePatientDisconnectionConfirmCmd( MESSAGE_T *message );
+
+// MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM
+void handleDisposableRemovalConfirmCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE
+BOOL sendDisposableRemovalConfirmResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST
+void handleUITreatmentLogDataRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE
+BOOL sendTreatmentLogData( BOOL accepted, U32 reason, TREATMENT_LOG_DATA_PAYLOAD_T *logDataPtr );
+
 // *********** public DG command functions **********
 
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
@@ -265,7 +289,10 @@
 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 );
@@ -286,7 +313,7 @@
 BOOL broadcastDialInFlowData( DIALIN_PUMP_STATUS_PAYLOAD_T *dialInData );
 
 // MSG_ID_DIALYSATE_OUT_FLOW_DATA
-BOOL broadcastDialOutFlowData( DIAL_OUT_FLOW_DATA_T *dialOutFlowData );
+BOOL broadcastDialOutFlowData( DIAL_OUT_FLOW_DATA_T *dialOutFlowData );
 
 // MSG_ID_HD_SYRINGE_PUMP_DATA
 BOOL broadcastSyringePumpData( SYRINGE_PUMP_DATA_PAYLOAD_T data );
@@ -296,6 +323,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 );
@@ -306,6 +336,9 @@
 // MSG_ID_TREATMENT_STATE
 BOOL broadcastTreatmentState( TREATMENT_STATE_DATA_T payload );
 
+// MSG_ID_HD_POST_TREATMENT_STATE
+BOOL broadcastPostTreatmentState( U32 postTreatmentSubMode );
+
 // MSG_ID_PRE_TREATMENT_STATE
 BOOL broadcastPreTreatmentState( PRE_TREATMENT_STATE_DATA_T *preTreatmentDataPtr );
 
@@ -342,9 +375,21 @@
 // MSG_ID_HD_DRY_SELF_TEST_PROGRESS
 BOOL broadcastDrySelfTestTime( U32 timeout, U32 countdown );
 
+// MSG_ID_HD_FLUID_LEAK_STATE
+BOOL broadcastFluidLeakState( FLUID_LEAK_STATES_T state );
+
 // MSG_ID_HD_PRIMING_STATUS_DATA
 BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr );
 
+// MSG_ID_HD_SEND_CALIBRATION_RECORD
+BOOL sendHDCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress );
+
+// MSG_ID_HD_SEND_SYSTEM_RECORD
+BOOL sendHDSystemRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress );
+
+// MSG_ID_Hd_SEND_SERVICE_RECORD
+BOOL sendHDServiceRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* srvcRcrdAddress );
+
 #ifdef EMC_TEST_BUILD
 // MSG_ID_CAN_ERROR_COUNT
 BOOL broadcastCANErrorCount( U32 count );
@@ -531,9 +576,36 @@
 // MSG_ID_HD_AIR_TRAP_LEVEL_SENSOR_OVERRIDE
 void handleSetAirTrapLevelSensorOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_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_SUPER_CLEAR_ALARMS_CMD
 void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_REQUEST_CALIBRATION_DATA
+void handleTestHDCalibrationDataRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_CALIBRATION_RECORD
+void handleSetHDCalibrationRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_GET_CALIBRATION_RECORD
+void handleGetHDCalibrationRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_SYSTEM_RECORD
+void handleSetHDSystemRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_GET_SYSTEM_RECORD
+void handleGetHDSystemRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_GET_SERVICE_RECORD
+void handleGetHDServiceRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_SERVICE_RECORD
+void handleSetHDServiceRecord( MESSAGE_T *message );
+
 // MSG_ID_HD_SET_OP_MODE_REQUEST
 void handleTestSetOpModeRequest( MESSAGE_T *message );
 
@@ -561,6 +633,27 @@
 // MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE:
 void handleTestSyringePumpMeasuredVolumeOverrideRequest( 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 );
+
 /**@}*/
 
 #endif