Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r2cc4f0cfc6512c942864d7d302cef5df375a2081 -r276c2634eab5a641ed7f0a548b31e1bb13ef5477
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 2cc4f0cfc6512c942864d7d302cef5df375a2081)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 276c2634eab5a641ed7f0a548b31e1bb13ef5477)
@@ -18,21 +18,26 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "HDCommon.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
+#include "BloodLeak.h"
 #include "BloodPrime.h"
+#include "Bubble.h"
 #include "DGInterface.h"
-#include "DialInFlow.h"
+#include "DialInFlow.h"
 #include "DialOutFlow.h"
-#include "Dialysis.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"
 #include "NVDataMgmt.h"
 #include "PresOccl.h"
 #include "Rinseback.h"
+#include "SyringePump.h"
 #include "Valves.h"
 
 /**
@@ -94,17 +99,17 @@
 // MSG_ID_DG_RESERVOIR_DATA:
 void handleDGReservoirData( MESSAGE_T *message );
 
-// MSG_ID_UI_START_TREATMENT
-void handleUIStartTreatmentMsg( MESSAGE_T *message );
+// MSG_ID_UI_INITIATE_TREATMENT_REQUEST
+void handleInitiateTreatmentRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_START_TREATMENT_RESPONSE
-BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason );
+// MSG_ID_UI_INITIATE_TREATMENT_RESPONSE
+BOOL sendInitiateTreatmentResponseMsg( BOOL accepted, U32 reason );
 
 // MSG_ID_UI_NEW_TREATMENT_PARAMS
 void handleTreatmentParametersFromUI( MESSAGE_T *message );
 
 // MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE
-BOOL sendTreatmentParametersResponseMsg( BOOL rejected, U08 *rejectReasons, U32 byteLength );
+BOOL sendTreatmentParametersResponseMsg( BOOL accepted, U08 *rejectReasons, U32 byteLength );
 
 // MSG_ID_UI_SET_UF_VOLUME_PARAMETER
 void handleUFVolumeSetRequest( MESSAGE_T *message );
@@ -163,6 +168,51 @@
 // MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE
 BOOL sendPressureLimitsChangeResponse( PRESSURE_LIMIT_CHANGE_RESPONSE_T *data );
 
+// MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST
+void handleHeparinCommandRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE
+BOOL sendHeparinCommandResponse( U32 accepted, U32 rejReason );
+
+// MSG_ID_UI_SAMPLE_WATER_CMD
+void handleSampleWaterCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_SAMPLE_WATER_CMD_RESPONSE
+BOOL sendSampleWaterCmdResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_SAMPLE_WATER_RESULT
+void handleSampleWaterResult( MESSAGE_T *message );
+
+// MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM
+void handleConsumableInstallConfirm( MESSAGE_T *message );
+
+// MSG_ID_UI_INSTALLATION_CONFIRM
+void handleInstallationConfirm( MESSAGE_T *message );
+
+// MSG_ID_UI_START_PRIME_REQUEST
+void handleStartPrimeCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_START_PRIME_RESPONSE
+BOOL sendStartPrimeCmdResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_CONTINUE_TO_TREATMENT_REQUEST
+void handleContinueToTreatmentCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_CONTINUE_TO_TREATMENT_RESPONSE
+BOOL sendContinueToTreatmentCmdResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_PATIENT_CONNECTION_CONFIRM
+void handlePatientConnectionConfirmCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE
+BOOL sendPatientConnectionConfirmCmdResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_START_TREATMENT_REQUEST
+void handleStartTreatmentRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_START_TREATMENT_RESPONSE
+BOOL sendStartTreatmentResponse( BOOL accepted, U32 reason );
+
 // MSG_ID_UI_RINSEBACK_CMD
 void handlRinsebackCmd( MESSAGE_T *message );
 
@@ -181,6 +231,23 @@
 // 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
 BOOL sendDialysateTempTargetsToDG( F32 primary, F32 trimmer );
 
@@ -191,7 +258,7 @@
 BOOL sendDGChangeValveSettingCommand( U32 valveSettingCmd );
 
 // MSG_ID_DG_FILL_CMD
-BOOL sendDGFillCommand( U32 fillToVolumeMl );
+BOOL sendDGFillCommand( U32 cmd, U32 fillToVolumeMl );
 
 // MSG_ID_DG_DRAIN_CMD
 BOOL sendDGDrainCommand( DRAIN_RESERVOIR_CMD_PAYLOAD_T *drainCmdPtr );
@@ -203,14 +270,16 @@
 BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start, F32 trimmerHtrTemp );
 
 // MSG_ID_DG_SAMPLE_WATER_CMD
-BOOL sendDGSampleWaterCommand( void );
+BOOL sendDGSampleWaterCommand( SAMPLE_WATER_CMD_T cmd );
 
 // MSG_ID_DG_COMMAND_RESPONSE
 void handleDGCmdResp( MESSAGE_T *messagePtr );
 
 // MSG_ID_DG_OP_MODE
 void handleDGOpMode( MESSAGE_T *message );
 
+// *********** 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 );
 
@@ -236,7 +305,13 @@
 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 );
+
+// MSG_ID_HD_HEPARIN_DATA_BROADCAST
+BOOL broadcastHeparinData( F32 volume );
 
 // MSG_ID_PRESSURE_OCCLUSION_DATA
 BOOL broadcastPresOcclData( PRESSURE_OCCLUSION_DATA_T data );
@@ -249,6 +324,12 @@
 
 // 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 );
 
 // MSG_ID_POWER_OFF_WARNING
 BOOL broadcastPowerOffWarning( void );
@@ -277,12 +358,33 @@
 // MSG_ID_HD_AIR_TRAP_DATA
 BOOL broadcastAirTrapData( AIR_TRAP_LEVELS_T lowerLevel, AIR_TRAP_LEVELS_T upperLevel );
 
+// MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS
+BOOL broadcastNoCartSelfTestTime( U32 timeout, U32 countdown );
+
+// 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_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_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 );
@@ -472,15 +574,78 @@
 // 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_HD_FLUID_LEAK_STATE_OVERRIDE
+void handleSetFluidLeakStateOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE
+void handleSetBloodLeakDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_BLOOD_LEAK_STATUS_OVERRIDE
+void handleSetBloodLeakStatusOverrideRequest( MESSAGE_T *message );
+
+// 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_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 );
 
+// MSG_ID_HD_SYRINGE_PUMP_SEND_INTERVAL_OVERRIDE:
+void handleTestSyringePumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_OPERATION_REQUEST:
+void handleTestSyringePumpOperationRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_MEASURED_RATE_OVERRIDE:
+void handleTestSyringePumpMeasuredRateOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_MEASURED_FORCE_OVERRIDE:
+void handleTestSyringePumpMeasuredForceOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_SYRINGE_DETECT_OVERRIDE:
+void handleTestSyringePumpMeasuredSyringeDetectOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_MEASURED_HOME_OVERRIDE:
+void handleTestSyringePumpMeasuredHomeOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_MEASURED_POSITION_OVERRIDE:
+void handleTestSyringePumpMeasuredPositionOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE:
+void handleTestSyringePumpMeasuredVolumeOverrideRequest( MESSAGE_T *message );
+
 /**@}*/
 
 #endif