Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rbaadbfda2c0b0a51ee830ec5de414604f9a3971e -r6419179374edcd65da462de84e8aeaefb7e20320
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision baadbfda2c0b0a51ee830ec5de414604f9a3971e)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
@@ -21,16 +21,19 @@
 #include "HDCommon.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
+#include "BloodPrime.h"
 #include "DGInterface.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
 #include "Dialysis.h"
+#include "FluidLeak.h"
 #include "Prime.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"
 
@@ -103,7 +106,7 @@
 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 );
@@ -138,9 +141,12 @@
 // MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE
 BOOL sendChangeTreatmentDurationResponse( BOOL accepted, U32 reason, U32 time_min, F32 volume_mL );
 
+// MSG_ID_TREATMENT_TIME_REMAINING_OVERRIDE:
+void handleTestTreatmentTimeRemainingOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_TREATMENT_PARAM_CHANGE_RANGES
 BOOL sendTreatmentParamsRangesToUI( U32 minTime, U32 maxTime, F32 minUFVol, F32 maxUFVol, U32 minDialRate, U32 maxDialRate );
-
+
 // MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST
 void handleChangeBloodDialysateRateChangeRequest( MESSAGE_T *message );
 
@@ -204,6 +210,24 @@
 // 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 );
+
 // *********** public DG command functions **********
 
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
@@ -263,13 +287,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 );
+BOOL broadcastHeparinData( F32 volume );
 
 // MSG_ID_PRESSURE_OCCLUSION_DATA
 BOOL broadcastPresOcclData( PRESSURE_OCCLUSION_DATA_T data );
@@ -281,7 +305,7 @@
 BOOL broadcastTreatmentTime( U32 secsTotTreatment, U32 secsElapsed, U32 secsRemaining );
 
 // MSG_ID_TREATMENT_STATE
-BOOL broadcastTreatmentState( U32 subMode, U32 uFState, U32 salineBolusState );
+BOOL broadcastTreatmentState( TREATMENT_STATE_DATA_T payload );
 
 // MSG_ID_PRE_TREATMENT_STATE
 BOOL broadcastPreTreatmentState( PRE_TREATMENT_STATE_DATA_T *preTreatmentDataPtr );
@@ -298,6 +322,18 @@
 // MSG_ID_SALINE_BOLUS_DATA
 BOOL broadcastSalineBolusData( SALINE_BOLUS_DATA_PAYLOAD_T data );
 
+// MSG_ID_HD_TREATMENT_STOP_TIMER_DATA
+BOOL broadcastTreatmentStopData(  U32 timeout, U32 countdown  );
+
+// MSG_ID_HD_RINSEBACK_PROGRESS
+BOOL broadcastRinsebackData( RINSEBACK_DATA_PAYLOAD_T data );
+
+// MSG_ID_HD_RECIRC_PROGRESS
+BOOL broadcastRecircData( U32 timeout, U32 countdown );
+
+// MSG_ID_HD_BLOOD_PRIME_PROGRESS
+BOOL broadcastBloodPrimeData( BLOOD_PRIME_DATA_PAYLOAD_T data );
+
 // MSG_ID_HD_AIR_TRAP_DATA
 BOOL broadcastAirTrapData( AIR_TRAP_LEVELS_T lowerLevel, AIR_TRAP_LEVELS_T upperLevel );
 
@@ -307,9 +343,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 );
@@ -455,15 +503,6 @@
 // MSG_ID_HD_ACCEL_SEND_INTERVAL_OVERRIDE:
 void handleTestHDAccelBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_ACCEL_SET_CALIBRATION:
-void handleSetAccelCalibration( MESSAGE_T *message );
-
-// MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION:
-void handleSetBloodFlowCalibration( MESSAGE_T *message );
-
-// MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION:
-void handleSetDialysateFlowCalibration( MESSAGE_T *message );
-
 // MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER
 void handleTestSetTreatmentParameter( MESSAGE_T *message );
 
@@ -505,15 +544,63 @@
 // 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_ERASE_CALIBRATION_DATA
-void handleTestEraseHDCalibrationDataRequest( 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