Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r7665e7b142961a50c5e77c44877247366a374526 -rd6c75118f4e5792b40b744a0b29e44c78368a469
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 7665e7b142961a50c5e77c44877247366a374526)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d6c75118f4e5792b40b744a0b29e44c78368a469)
@@ -33,6 +33,7 @@
 #include "NVDataMgmt.h"
 #include "PresOccl.h"
 #include "Rinseback.h"
+#include "SyringePump.h"
 #include "Valves.h"
 
 /**
@@ -94,17 +95,20 @@
 // MSG_ID_DG_RESERVOIR_DATA:
 void handleDGReservoirData( MESSAGE_T *message );
 
-// MSG_ID_UI_START_TREATMENT
-void handleUIStartTreatmentMsg( MESSAGE_T *message );
+// MSG_ID_UI_START_TREATMENT_REQUEST
+void handleStartTreatmentRequest( 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_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 +167,12 @@
 // 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_RINSEBACK_CMD
 void handlRinsebackCmd( MESSAGE_T *message );
 
@@ -236,7 +246,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 );
@@ -511,6 +527,30 @@
 // 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