Index: firmware/App/Controllers/BloodFlow.h
===================================================================
diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Controllers/BloodFlow.h	(.../BloodFlow.h)	(revision de5a0d43bdef611d963d11855bc958a8d8899a09)
+++ firmware/App/Controllers/BloodFlow.h	(.../BloodFlow.h)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -47,16 +47,18 @@
 
 SELF_TEST_STATUS_T execBloodFlowTest( void );
 
-DATA_GET_PROTOTYPE( S32, getTargetBloodFlowRate );
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodFlowRate);
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodPumpRotorSpeed );
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodPumpSpeed );
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodPumpMCSpeed );
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodPumpMCCurrent );
-
+S32  getTargetBloodFlowRate( void );
+F32  getMeasuredBloodFlowRate( void );
+F32  getMeasuredBloodPumpRotorSpeed( void );
+F32  getMeasuredBloodPumpSpeed( void );
+F32  getMeasuredBloodPumpMCSpeed( void );
+F32  getMeasuredBloodPumpMCCurrent( void );
+
+BOOL setBloodFlowCalibration( F32 gain, F32 offset );
+void getBloodFlowCalibration( F32 *gain, F32 *offset );
 BOOL testSetBloodFlowDataPublishIntervalOverride( U32 value );
 BOOL testResetBloodFlowDataPublishIntervalOverride( void );
-BOOL testSetTargetBloodFlowRateOverride( S32 value );
+BOOL testSetTargetBloodFlowRateOverride( S32 value, U32 bloodPumpControlMode );
 BOOL testResetTargetBloodFlowRateOverride( void );
 BOOL testSetMeasuredBloodFlowRateOverride( F32 value );
 BOOL testResetMeasuredBloodFlowRateOverride( void );