Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -r1a685471524555a374854c0c9ec8e208e71fe2df
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
@@ -19,11 +19,14 @@
 #define __SYSTEM_COMM_MESSAGES_H__
 
 #include "HDCommon.h"
-#include "AirTrap.h"
+#include "AirTrap.h"
+#include "BloodFlow.h"
 #include "DGInterface.h"
-#include "DialOutFlow.h"
+#include "DialInFlow.h"
+#include "DialOutFlow.h"
+#include "Dialysis.h"
 #include "MsgQueues.h"
-#include "Valves.h"
+#include "Valves.h"
 
 /**
  *  @defgroup SystemCommMessages SystemCommMessages
@@ -94,14 +97,17 @@
 void handleTreatmentParametersFromUI( MESSAGE_T *message );
 
 // MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE
-BOOL sendTreatmentParametersResponseMsg( BOOL accepted, U08 *rejectReasons, U32 byteLength );
+BOOL sendTreatmentParametersResponseMsg( BOOL rejected, U08 *rejectReasons, U32 byteLength );
 
 // MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS
 void handleUIUserConfirmTreatmentParameters( MESSAGE_T *message );
 
 // MSG_ID_USER_UF_PAUSE_RESUME_REQUEST
 void handleUFPauseResumeRequest( MESSAGE_T *message );
-
+
+// MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE
+BOOL sendUFPauseResumeResponse( BOOL accepted, U32 reason, U32 ufState );
+
 // MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST
 void handleChangeUFSettingsRequest( MESSAGE_T *message );
 
@@ -126,6 +132,12 @@
 // 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 );
+
 // MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE
 BOOL sendChangeBloodDialysateRateChangeResponse( BOOL accepted, U32 reason, U32 bloodRate, U32 dialRate );
 
@@ -166,10 +178,10 @@
 BOOL broadcastAlarmCleared( U16 alarm );
 
 // MSG_ID_BLOOD_FLOW_DATA
-BOOL broadcastBloodFlowData( U32 flowStPt, F32 measFlow, F32 measRotorSpd, F32 measSpd, F32 measMCSpd, F32 measMCCurr, F32 pwmDC );
+BOOL broadcastBloodFlowData( BLOOD_PUMP_STATUS_PAYLOAD_T *bloodData );
 
 // MSG_ID_DIALYSATE_FLOW_DATA
-BOOL broadcastDialInFlowData( U32 flowStPt, F32 measFlow, F32 measRotorSpd, F32 measSpd, F32 measMCSpd, F32 measMCCurr, F32 pwmDC );
+BOOL broadcastDialInFlowData( DIALIN_PUMP_STATUS_PAYLOAD_T *dialInData );
 
 // MSG_ID_DIALYSATE_OUT_FLOW_DATA
 BOOL broadcastDialOutFlowData( DIAL_OUT_FLOW_DATA_T *dialOutFlowData );
@@ -195,6 +207,9 @@
 // MSG_ID_HD_VALVES_DATA
 BOOL broadcastHDValves( HD_VALVE_DATA_T *valveData );
 
+// MSG_ID_SALINE_BOLUS_DATA
+BOOL broadcastSalineBolusData( SALINE_BOLUS_DATA_PAYLOAD_T data );
+
 // MSG_ID_HD_AIR_TRAP_DATA
 BOOL broadcastAirTrapData( AIR_TRAP_LEVELS_T lowerLevel, AIR_TRAP_LEVELS_T upperLevel );
 
@@ -244,6 +259,9 @@
 // MSG_ID_BLOOD_FLOW_MEAS_OVERRIDE
 void handleTestBloodFlowMeasuredOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE
+void handleTestBloodFlowSignalStrengthOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE
 void handleTestBloodPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
 
@@ -268,6 +286,9 @@
 // MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE
 void handleTestDialInFlowMeasuredOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE
+void handleTestDialInFlowSignalStrengthOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE
 void handleTestDialInPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
 
@@ -369,15 +390,27 @@
 void handleSetHDValvePWMOverrideRequest( MESSAGE_T *message );
 #endif
 
+// MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER
+void handleTestSetTreatmentParameter( MESSAGE_T *message );
+
+// MSG_ID_HD_SOFTWARE_RESET_REQUEST
+void handleHDSoftwareResetRequest( MESSAGE_T *message );
+
+// MSG_ID_BLOOD_PUMP_HOME_CMD
+void handleTestBloodPumpHomeRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_IN_PUMP_HOME_CMD
+void handleTestDialInPumpHomeRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_OUT_PUMP_HOME_CMD
+void handleTestDialOutPumpHomeRequest( MESSAGE_T *message );
+
 // MSG_ID_HD_AIR_TRAP_SEND_INTERVAL_OVERRIDE
 void handleSetAirTrapBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_HD_AIR_TRAP_LEVEL_SENSOR_OVERRIDE
 void handleSetAirTrapLevelSensorOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_SOFTWARE_RESET_REQUEST
-void handleHDSoftwareResetRequest( MESSAGE_T *message );
-
 /**@}*/
 
 #endif