Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r766708fceb0bdf1af8c7897df29d4f5036bfd3db -r27f3db92495948d4c1192421c1b0c20338c4a034
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
@@ -21,14 +21,17 @@
 #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 "Dialysis.h"
+#include "Prime.h"
 #include "ModeTreatment.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "PresOccl.h"
+#include "Rinseback.h"
 #include "Valves.h"
 
 /**
@@ -96,12 +99,6 @@
 // MSG_ID_HD_START_TREATMENT_RESPONSE
 BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason );
 
-// MSG_ID_UI_TREATMENT_END_REQUEST
-void handleUIUserEndTreatmentRequest( MESSAGE_T *message );
-
-// MSG_ID_HD_TREATMENT_END_RESPONSE
-BOOL sendTreatmentEndResponseMsg( BOOL accepted );
-
 // MSG_ID_UI_NEW_TREATMENT_PARAMS
 void handleTreatmentParametersFromUI( MESSAGE_T *message );
 
@@ -141,9 +138,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 );
 
@@ -162,11 +162,32 @@
 // 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_SET_DG_DIALYSATE_TEMP_TARGETS
 BOOL sendDialysateTempTargetsToDG( F32 primary, F32 trimmer );
 
 // MSG_ID_DG_SWITCH_RESERVOIR_CMD
 BOOL sendDGSwitchReservoirCommand( U32 activeReservoir );
+
+// MSG_ID_DG_CHANGE_VALVE_SETTING_CMD
+BOOL sendDGChangeValveSettingCommand( U32 valveSettingCmd );
 
 // MSG_ID_DG_FILL_CMD
 BOOL sendDGFillCommand( U32 fillToVolumeMl );
@@ -177,13 +198,16 @@
 // MSG_ID_STARTING_STOPPING_TREATMENT_CMD
 BOOL sendDGStartStopCommand( BOOL start );
 
+// MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
+BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start, F32 trimmerHtrTemp );
+
 // MSG_ID_DG_SAMPLE_WATER_CMD
 BOOL sendDGSampleWaterCommand( void );
+
+// MSG_ID_DG_COMMAND_RESPONSE
+void handleDGCmdResp( MESSAGE_T *messagePtr );
 
-// MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
-BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start );
-
-// MSG_ID_DG_OP_MODE:
+// MSG_ID_DG_OP_MODE
 void handleDGOpMode( MESSAGE_T *message );
 
 // MSG_ID_HD_ACCELEROMETER_DATA
@@ -195,6 +219,9 @@
 // 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 );
 
@@ -220,7 +247,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_POWER_OFF_WARNING
 BOOL broadcastPowerOffWarning( void );
@@ -234,9 +261,24 @@
 // 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 );
 
+// MSG_ID_HD_PRIMING_STATUS_DATA
+BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr );
+
 #ifdef EMC_TEST_BUILD
 // MSG_ID_CAN_ERROR_COUNT
 BOOL broadcastCANErrorCount( U32 count );
@@ -382,15 +424,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 );
 
@@ -435,12 +468,9 @@
 // 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 );
-
 /**@}*/
 
 #endif