Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rc3cf7af051c1ee070df90a9c072df16be48f478f -r9bc5e72e777b0bf72807428e40450705b1eef321
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c3cf7af051c1ee070df90a9c072df16be48f478f)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9bc5e72e777b0bf72807428e40450705b1eef321)
@@ -21,6 +21,7 @@
 #include "HDCommon.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
+#include "BloodPrime.h"
 #include "DGInterface.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
@@ -31,6 +32,7 @@
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "PresOccl.h"
+#include "Rinseback.h"
 #include "SyringePump.h"
 #include "Valves.h"
 
@@ -138,17 +140,20 @@
 // 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 );
 
 // MSG_ID_USER_SALINE_BOLUS_REQUEST
 void handleSalineBolusRequest( MESSAGE_T *message );
 
 // MSG_ID_USER_SALINE_BOLUS_RESPONSE
-BOOL sendSalineBolusResponse( BOOL accepted, U32 rejReason, U32 bolusVol );
+BOOL sendSalineBolusResponse( BOOL accepted, U32 rejReason, U32 bolusVol, U32 bolusState );
 
 // MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE
 BOOL sendChangeBloodDialysateRateChangeResponse( BOOL accepted, U32 reason, U32 bloodRate, U32 dialRate );
@@ -159,6 +164,24 @@
 // MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE
 BOOL sendPressureLimitsChangeResponse( PRESSURE_LIMIT_CHANGE_RESPONSE_T *data );
 
+// 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_SAMPLE_WATER_CMD
 void handleSampleWaterCmd( MESSAGE_T *message );
 
@@ -272,7 +295,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 );
@@ -289,6 +312,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 );
 
@@ -446,15 +481,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 );
 
@@ -499,12 +525,33 @@
 // 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_OP_MODE_REQUEST
+void handleTestSetOpModeRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_ERASE_CALIBRATION_DATA
-void handleTestEraseHDCalibrationDataRequest( 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