Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rd27dcf1fbbc9651636f211028917a1c0702bb56a -r7a7bf19d0cf16745566956f45cef57f8eb5df445
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision d27dcf1fbbc9651636f211028917a1c0702bb56a)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
@@ -236,7 +236,6 @@
 static void checkBloodPumpFlowAgainstSpeed( void );
 static void checkBloodPumpMCCurrent( void );
 static void checkBloodFlowSensorSignalStrength( void );
-static U32  getPublishBloodFlowDataInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -778,33 +777,13 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishBloodFlowDataInterval function gets the blood flow data
- * publication interval.
- * @details Inputs: bloodFlowDataPublishInterval
- * @details Outputs: none
- * @return the current blood flow data publication interval (in task intervals).
- *************************************************************************/
-U32 getPublishBloodFlowDataInterval( void )
-{
-    U32 result = bloodFlowDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == bloodFlowDataPublishInterval.override )
-    {
-        result = bloodFlowDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The getMeasuredBloodFlowRate function gets the measured blood flow
  * rate.
  * @details Inputs: measuredBloodFlowRate
  * @details Outputs: none
  * @return the current blood flow rate (in mL/min).
  *************************************************************************/
-F32  getMeasuredBloodFlowRate( void )
+F32 getMeasuredBloodFlowRate( void )
 {
     F32 result = measuredBloodFlowRate.data;
 
@@ -844,7 +823,7 @@
  * @details Outputs: none
  * @return the current blood flow rate (in mL/min).
  *************************************************************************/
-F32  getMeasuredBloodPumpRotorSpeed( void )
+F32 getMeasuredBloodPumpRotorSpeed( void )
 {
     F32 result = bloodPumpRotorSpeedRPM.data;
 
@@ -864,7 +843,7 @@
  * @details Outputs: none
  * @return the current blood flow rate (in mL/min).
  *************************************************************************/
-F32  getMeasuredBloodPumpSpeed( void )
+F32 getMeasuredBloodPumpSpeed( void )
 {
     F32 result = bloodPumpSpeedRPM.data;
 
@@ -884,7 +863,7 @@
  * @details Outputs: none
  * @return the current blood pump speed (in RPM).
  *************************************************************************/
-F32  getMeasuredBloodPumpMCSpeed( void )
+F32 getMeasuredBloodPumpMCSpeed( void )
 {
     F32 result = adcBloodPumpMCSpeedRPM.data;
 
@@ -904,7 +883,7 @@
  * @details Outputs: none
  * @return the current blood pump current (in mA).
  *************************************************************************/
-F32  getMeasuredBloodPumpMCCurrent( void )
+F32 getMeasuredBloodPumpMCCurrent( void )
 {
     F32 result = adcBloodPumpMCCurrentmA.data;
 
@@ -928,7 +907,7 @@
 static void publishBloodFlowData( void )
 {
     // Publish blood flow data on interval
-    if ( ++bloodFlowDataPublicationTimerCounter >= getPublishBloodFlowDataInterval() )
+    if ( ++bloodFlowDataPublicationTimerCounter >= getU32OverrideValue( &bloodFlowDataPublishInterval ) )
     {
         BLOOD_PUMP_STATUS_PAYLOAD_T payload;