Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -ra1a0187daedaf2c12e6f9eccfbf9e423d952e029 -rfb714597ad515d3774d69b94808f065788504724
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a1a0187daedaf2c12e6f9eccfbf9e423d952e029)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision fb714597ad515d3774d69b94808f065788504724)
@@ -14,11 +14,11 @@
 * @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
-
-#ifndef __SYSTEM_COMM_MESSAGES_H__
-#define __SYSTEM_COMM_MESSAGES_H__
 
-#include "AirPump.h"
+#ifndef __SYSTEM_COMM_MESSAGES_H__
+#define __SYSTEM_COMM_MESSAGES_H__
+
+#include "AirPump.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
 #include "BloodLeak.h"
@@ -27,13 +27,13 @@
 #include "CommBuffers.h"
 #include "DGInterface.h"
 #include "DialInFlow.h"
-#include "DialOutFlow.h"
+#include "DialOutFlow.h"
 #include "Dialysis.h"
-#include "Fans.h"
+#include "Fans.h"
 #include "FluidLeak.h"
 #include "HDCommon.h"
 #include "MessageSupport.h"
-#include "ModeInitPOST.h"
+#include "ModeInitPOST.h"
 #include "ModePostTreat.h"
 #include "ModePreTreat.h"
 #include "ModeStandby.h"
@@ -49,7 +49,7 @@
 #include "Temperatures.h"
 #include "Valves.h"
 #include "Voltages.h"
-
+
 /**
  *  @defgroup SystemCommMessages SystemCommMessages
  *  @brief The system communication messages module provides helper functions
@@ -62,7 +62,7 @@
 // ********** public definitions **********
 
 #define ACK_REQUIRED                    TRUE                ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
-#define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
+#define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 
 #pragma pack(push, 1)
 /// Payload record structure for ACK response.
@@ -136,22 +136,22 @@
     U32 minDialRate;            ///< Minimum dialysate flow rate (in mL/min)
     U32 maxDialRate;            ///< Maximum dialysate flow rate (in mL/min)
 } TREATMENT_PARAM_BROADCAST_PAYLOAD_T;
-
-// ********** public function prototypes **********
 
-// Serialize message
+// ********** public function prototypes **********
+
+// Serialize message
 U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
 
-// ACK MSG
+// ACK MSG
 BOOL sendACKMsg( MESSAGE_T *message );
 
-// MSG_ID_DG_CHECK_IN
-void handleDGCheckIn( MESSAGE_T *message );
-
-// MSG_ID_UI_CHECK_IN
-void handleUICheckIn( MESSAGE_T *message );
-
-// MSG_ID_REQUEST_FW_VERSIONS
+// MSG_ID_DG_CHECK_IN
+void handleDGCheckIn( MESSAGE_T *message );
+
+// MSG_ID_UI_CHECK_IN
+void handleUICheckIn( MESSAGE_T *message );
+
+// MSG_ID_REQUEST_FW_VERSIONS
 void handleFWVersionRequest( MESSAGE_T *message );
 
 // MSG_ID_REQUEST_FW_VERSIONS
@@ -170,8 +170,8 @@
 void handleHDServiceScheduleRequest( MESSAGE_T *message );
 
 // MSG_ID_REQUEST_HD_USAGE_INFO
-void handleHDUsageInfoRequest( MESSAGE_T *message );
-
+void handleHDUsageInfoRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_VERSION
 void handleDGVersionResponse( MESSAGE_T *message );
 
@@ -181,16 +181,16 @@
 // MSG_ID_HD_EVENT
 BOOL sendEvent( HD_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
 
-// MSG_ID_OFF_BUTTON_PRESS
-BOOL sendOffButtonMsgToUI( U08 cmd );
-void handleOffButtonConfirmMsgFromUI( MESSAGE_T *message );
+// MSG_ID_OFF_BUTTON_PRESS
+BOOL sendOffButtonMsgToUI( U08 cmd );
+void handleOffButtonConfirmMsgFromUI( MESSAGE_T *message );
 
 // MSG_ID_ALARM_TRIGGERED
 void handleAlarmTriggered( MESSAGE_T *message );
 
 // MSG_ID_ALARM_CLEARED
 void handleAlarmCleared( MESSAGE_T *message );
-
+
 // MSG_ID_USER_REQUEST_ALARM_SILENCE
 void handleUIAlarmSilenceRequest( MESSAGE_T *message );
 
@@ -212,19 +212,19 @@
 // MSG_ID_UI_POST_FINAL_TEST_RESULT
 void handleUIPOSTFinalResult( MESSAGE_T *message );
 
-// MSG_ID_LOAD_CELL_READINGS
+// MSG_ID_LOAD_CELL_READINGS
 void handleLoadCellReadingsFromDG( MESSAGE_T *message );
 
 // MSG_ID_DG_HEATERS_DATA
-void handleDGHeatersData( MESSAGE_T *message );
-
-// MSG_ID_DG_TEMPERATURE_DATA:
-void handleDGTemperatureData( MESSAGE_T *message );
-
+void handleDGHeatersData( MESSAGE_T *message );
+
+// MSG_ID_DG_TEMPERATURE_DATA:
+void handleDGTemperatureData( MESSAGE_T *message );
+
 // MSG_ID_DG_FLOW_SENSORS_DATA
-void handleDialysateFlowData( MESSAGE_T *message );
-
-// MSG_ID_DG_RESERVOIR_DATA:
+void handleDialysateFlowData( MESSAGE_T *message );
+
+// MSG_ID_DG_RESERVOIR_DATA:
 void handleDGReservoirData( MESSAGE_T *message );
 
 // MSG_ID_UI_INITIATE_TREATMENT_REQUEST
@@ -237,8 +237,8 @@
 void handleTreatmentParametersFromUI( MESSAGE_T *message );
 
 // MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE
-BOOL sendTreatmentParametersResponseMsg( BOOL accepted, U08 *rejectReasons, U32 byteLength );
-
+BOOL sendTreatmentParametersResponseMsg( BOOL accepted, U08 *rejectReasons, U32 byteLength );
+
 // MSG_ID_UI_SET_UF_VOLUME_PARAMETER
 void handleUFVolumeSetRequest( MESSAGE_T *message );
 
@@ -248,40 +248,40 @@
 // 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_REQUEST
+void handleUFPauseResumeRequest( MESSAGE_T *message );
 
-// MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE
+// 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 );
-
-// MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE
-BOOL sendChangeUFSettingsResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min, S32 timeDiff, F32 rateDiff, F32 oldUFRate_mL_min );
-
-// MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE
-void handleChangeUFSettingsConfirmation( MESSAGE_T *message );
-
-// MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE
-BOOL sendChangeUFSettingsOptionResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min );
-
-// MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST
-void handleChangeTreatmentDurationRequest( MESSAGE_T *message );
-
-// MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE
-BOOL sendChangeTreatmentDurationResponse( BOOL accepted, U32 reason, U32 time_min, F32 volume_mL );
-
+// MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST
+void handleChangeUFSettingsRequest( MESSAGE_T *message );
+
+// MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE
+BOOL sendChangeUFSettingsResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min, S32 timeDiff, F32 rateDiff, F32 oldUFRate_mL_min );
+
+// MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE
+void handleChangeUFSettingsConfirmation( MESSAGE_T *message );
+
+// MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE
+BOOL sendChangeUFSettingsOptionResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min );
+
+// MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST
+void handleChangeTreatmentDurationRequest( MESSAGE_T *message );
+
+// 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_TREATMENT_PARAM_CHANGE_RANGES
+BOOL sendTreatmentParamsRangesToUI( U32 minTime, U32 maxTime, F32 minUFVol, F32 maxUFVol, U32 minDialRate, U32 maxDialRate );
 
 // MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA
 BOOL sendTreatmentPeriodicDataToUI( TREATMENT_LOG_DATA_PERIODIC_T * periodDataPtr );
 
-// MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST
+// MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST
 void handleChangeBloodDialysateRateChangeRequest( MESSAGE_T *message );
 
 // MSG_ID_USER_SALINE_BOLUS_REQUEST
@@ -290,9 +290,9 @@
 // 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 );
-
+// MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE
+BOOL sendChangeBloodDialysateRateChangeResponse( BOOL accepted, U32 reason, U32 bloodRate, U32 dialRate );
+
 // MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST
 void handleChangePressureLimitsRequest( MESSAGE_T *message );
 
@@ -427,37 +427,37 @@
 
 // *********** public DG command functions **********
 
-// MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
-BOOL sendDialysateHeatingParamsToDG( DG_CMD_DIALYSATE_HEATING_PARAMS_T *params );
-
-// MSG_ID_DG_SWITCH_RESERVOIR_CMD
-BOOL sendDGSwitchReservoirCommand( DG_SWITCH_RSRVRS_CMD_T *cmd );
+// MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
+BOOL sendDialysateHeatingParamsToDG( DG_CMD_DIALYSATE_HEATING_PARAMS_T *params );
 
+// MSG_ID_DG_SWITCH_RESERVOIR_CMD
+BOOL sendDGSwitchReservoirCommand( DG_SWITCH_RSRVRS_CMD_T *cmd );
+
 // MSG_ID_DG_CHANGE_VALVE_SETTING_CMD
 BOOL sendDGChangeValveSettingCommand( U32 valveSettingCmd );
-
-// MSG_ID_DG_FILL_CMD
-BOOL sendDGFillCommand( U32 cmd, U32 fillToVolumeMl, F32 targetFlowRateLPM );
-
-// MSG_ID_DG_DRAIN_CMD
-BOOL sendDGDrainCommand( DRAIN_RESERVOIR_CMD_PAYLOAD_T *drainCmdPtr );
-
-// MSG_ID_STARTING_STOPPING_TREATMENT_CMD
-BOOL sendDGStartStopCommand( BOOL start );
-
-// MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
-BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start );
-
-// MSG_ID_DG_SAMPLE_WATER_CMD
-BOOL sendDGSampleWaterCommand( SAMPLE_WATER_CMD_T cmd );
 
+// MSG_ID_DG_FILL_CMD
+BOOL sendDGFillCommand( U32 cmd, U32 fillToVolumeMl, F32 targetFlowRateLPM );
+
+// MSG_ID_DG_DRAIN_CMD
+BOOL sendDGDrainCommand( DRAIN_RESERVOIR_CMD_PAYLOAD_T *drainCmdPtr );
+
+// MSG_ID_STARTING_STOPPING_TREATMENT_CMD
+BOOL sendDGStartStopCommand( BOOL start );
+
+// MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
+BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start );
+
+// MSG_ID_DG_SAMPLE_WATER_CMD
+BOOL sendDGSampleWaterCommand( SAMPLE_WATER_CMD_T cmd );
+
 // MSG_ID_DG_COMMAND_RESPONSE
 void handleDGCmdResp( MESSAGE_T *messagePtr );
 
 // MSG_ID_UI_HD_SET_RTC_REQUEST:
 void handleUIClockSyncRequest( MESSAGE_T *message );
-
-// MSG_ID_DG_OP_MODE
+
+// MSG_ID_DG_OP_MODE
 void handleDGOpMode( MESSAGE_T *message );
 
 // MSG_ID_DG_START_STOP_FLUSH
@@ -484,7 +484,7 @@
 // MSG_ID_UI_REQUEST_SERVICE_MODE
 void handleUIServiceModeRequest( MESSAGE_T *message );
 
-// MSG_ID_ALARM_STATUS
+// MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
 
 // MSG_ID_HD_SEND_CALIBRATION_RECORD
@@ -567,130 +567,130 @@
 // MSG_ID_DG_START_STOP_PASSIVE_COOL_HEAT_DISINFECT
 BOOL sendDGStartHeatDisinfectPassiveCoolModeCommand( BOOL start );
 
-// *********** public test support message functions **********
-
-// MSG_TESTER_LOG_IN
-void handleTesterLogInRequest( MESSAGE_T *message );
+// *********** public test support message functions **********
+
+// MSG_TESTER_LOG_IN
+void handleTesterLogInRequest( MESSAGE_T *message );
 BOOL isTestingActivated( void );
-void setTesterStatusToLoggedOut( void );
-
-// MSG_ID_OFF_BUTTON_STATE_OVERRIDE
-void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_STOP_BUTTON_STATE_OVERRIDE
-void handleTestStopButtonStateOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE
-void handleTestAlarmLampPatternOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE:
-void handleTestWatchdogCheckInStateOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_ALARM_STATE_OVERRIDE
-void handleTestAlarmStateOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_ALARM_TIME_OVERRIDE
-void handleTestAlarmTimeOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE
-void handleTestBloodFlowSetPointOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_BLOOD_FLOW_MEAS_OVERRIDE
-void handleTestBloodFlowMeasuredOverrideRequest( MESSAGE_T *message );
-
+void setTesterStatusToLoggedOut( void );
+
+// MSG_ID_OFF_BUTTON_STATE_OVERRIDE
+void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_STOP_BUTTON_STATE_OVERRIDE
+void handleTestStopButtonStateOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE
+void handleTestAlarmLampPatternOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE:
+void handleTestWatchdogCheckInStateOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_ALARM_STATE_OVERRIDE
+void handleTestAlarmStateOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_ALARM_TIME_OVERRIDE
+void handleTestAlarmTimeOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE
+void handleTestBloodFlowSetPointOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_BLOOD_FLOW_MEAS_OVERRIDE
+void handleTestBloodFlowMeasuredOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE
 void handleHDBloodPumpRotorCountOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE
 void handleHDDialInPumpRotorCountOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE
-void handleTestBloodPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE
-void handleTestBloodPumpMCMeasuredCurrentOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE
-void handleTestBloodFlowBroadcastIntervalOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE
-void handleTestBloodPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
-void handleTestBloodPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE
+// MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE
+void handleTestBloodPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE
+void handleTestBloodPumpMCMeasuredCurrentOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE
+void handleTestBloodFlowBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE
+void handleTestBloodPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
+void handleTestBloodPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE
 void handleTestDialInFlowSetPointOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE
-void handleTestDialOutFlowSetPointOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE
-void handleTestDialInFlowMeasuredOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE
-void handleTestDialInPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_IN_PUMP_MC_MEAS_CURR_OVERRIDE
-void handleTestDialInPumpMCMeasuredCurrentOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE
-void handleTestDialInFlowBroadcastIntervalOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE
-void handleTestDialInPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_IN_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
-void handleTestDialInPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_PRESSURE_ARTERIAL_OVERRIDE
-void handleTestArterialPressureOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_PRESSURE_VENOUS_OVERRIDE
-void handleTestVenousPressureOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE
+void handleTestDialOutFlowSetPointOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE
+void handleTestDialInFlowMeasuredOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE
+void handleTestDialInPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_IN_PUMP_MC_MEAS_CURR_OVERRIDE
+void handleTestDialInPumpMCMeasuredCurrentOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE
+void handleTestDialInFlowBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE
+void handleTestDialInPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_IN_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
+void handleTestDialInPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_PRESSURE_ARTERIAL_OVERRIDE
+void handleTestArterialPressureOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_PRESSURE_VENOUS_OVERRIDE
+void handleTestVenousPressureOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE
 void handleTestBloodPumpOcclusionOverrideRequest( MESSAGE_T *message );
 
 //MSG_ID_HD_PARTIAL_OCCLUSION_BLOOD_PUMP_OVERRIDE
 void handleTestFilteredBloodPumpOcclusionOverrideRequest( MESSAGE_T *message );
 
 //MSG_ID_HD_PARTIAL_OCCL_BLOOD_PUMP_BASELINE_OVERRIDE
-void handleTestBloodPumpOcclusionBaselineOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE
-void handleTestPresOcclBroadcastIntervalOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_SET_RTC_TIMESTAMP
-void handleSetRTCTimestamp( MESSAGE_T *message );
-
-// MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE
-void handleTestDialOutFlowBroadcastIntervalOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_OUT_UF_REF_VOLUME_OVERRIDE
-void handleTestDialOutUFReferenceVolumeOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE
-void handleTestDialOutUFMeasuredVolumeOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_OUT_PUMP_MC_MEAS_SPEED_OVERRIDE
-void handleTestDialOutPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_OUT_PUMP_MC_MEAS_CURR_OVERRIDE
-void handleTestDialOutPumpMCMeasuredCurrentOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE
-void handleTestDialOutPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_OUT_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
-void handleTestDialOutPumpMeasuredRotorSpeedOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE
-void handleTestDialOutLoadCellWeightOverrideRequest( MESSAGE_T *message );
-
-// MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE:
-void handleTestHDSafetyShutdownOverrideRequest( MESSAGE_T *message );
+void handleTestBloodPumpOcclusionBaselineOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE
+void handleTestPresOcclBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_SET_RTC_TIMESTAMP
+void handleSetRTCTimestamp( MESSAGE_T *message );
+
+// MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE
+void handleTestDialOutFlowBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_OUT_UF_REF_VOLUME_OVERRIDE
+void handleTestDialOutUFReferenceVolumeOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE
+void handleTestDialOutUFMeasuredVolumeOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_OUT_PUMP_MC_MEAS_SPEED_OVERRIDE
+void handleTestDialOutPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_OUT_PUMP_MC_MEAS_CURR_OVERRIDE
+void handleTestDialOutPumpMCMeasuredCurrentOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE
+void handleTestDialOutPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_OUT_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
+void handleTestDialOutPumpMeasuredRotorSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE
+void handleTestDialOutLoadCellWeightOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE:
+void handleTestHDSafetyShutdownOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_HD_ACCEL_OVERRIDE:
 void handleTestHDAccelOverrideRequest( MESSAGE_T *message );
 
@@ -1033,6 +1033,15 @@
 // MSG_ID_HD_SET_INSTITUTIONAL_RECORD
 void handleSetHDInstitutionalRecord( MESSAGE_T *message );
 
+// MSG_ID_HD_BLOOD_LEAK_EMB_MODE_INFO_VALUES_OVERRIDE
+void handleBloodLeakEmbModeInfoValuesOverride( MESSAGE_T* message );
+
+// MSG_ID_HD_BLOOD_LEAK_INTENSITY_MVG_AVERAGE_OVERRIDE
+void handleBloodLeakIntensityMovingAverageOverride( MESSAGE_T* message );
+
+// MSG_ID_HD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MINS_OVERRIDE
+void handleBloodLeakZeroingIntervalInMinutesOverride( MESSAGE_T* message );
+
 /**@}*/
 
-#endif
+#endif