Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r054fa08b67ed2a31f7848b179fbcd1b4da501b0f -r6463655c18b173e335b6d475ac7289336f1bf092
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 054fa08b67ed2a31f7848b179fbcd1b4da501b0f)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 6463655c18b173e335b6d475ac7289336f1bf092)
@@ -940,7 +940,7 @@
 /*************************************************************************
  * @brief
  * The testSetTargetBloodFlowRateOverride function overrides the target \n
- * blood flow rate. \n
+ * blood flow rate.
  * @details
  * Inputs : none
  * Outputs : targetBloodFlowRate
@@ -999,73 +999,238 @@
 }
 
 /*************************************************************************
- * @brief testSetMeasuredBloodFlowRateOverride and testResetMeasuredBloodFlowRateOverride
+ * @brief
  * The testResetMeasuredBloodFlowRateOverride function overrides the measured \n
- * blood flow rate. \n
- * The testResetOffButtonStateOverride function resets the override of the \n
- * measured blood flow rate.
+ * blood flow rate.
  * @details
  * Inputs : none
  * Outputs : measuredBloodFlowRate
  * @param value : override measured blood flow rate (in mL/min)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodFlowRateOverride, testResetMeasuredBloodFlowRateOverride, measuredBloodFlowRate )
+BOOL testSetMeasuredBloodFlowRateOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        measuredBloodFlowRate.ovData = value;
+        measuredBloodFlowRate.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredBloodPumpRotorSpeedOverride and testResetMeasuredBloodPumpRotorSpeedOverride
+ * @brief
+ * The testResetOffButtonStateOverride function resets the override of the \n
+ * measured blood flow rate.
+ * @details
+ * Inputs : none
+ * Outputs : measuredBloodFlowRate
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredBloodFlowRateOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        measuredBloodFlowRate.override = OVERRIDE_RESET;
+        measuredBloodFlowRate.ovData = measuredBloodFlowRate.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredBloodPumpRotorSpeedOverride function overrides the measured \n
- * blood pump rotor speed. \n
- * The testResetMeasuredBloodPumpRotorSpeedOverride function resets the override of the \n
- * measured blood pump rotor speed.
+ * blood pump rotor speed.
  * @details
  * Inputs : none
  * Outputs : bloodPumpRotorSpeedRPM
  * @param value : override measured blood pump rotor speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodPumpRotorSpeedOverride, testResetMeasuredBloodPumpRotorSpeedOverride, bloodPumpRotorSpeedRPM )
+BOOL testSetMeasuredBloodPumpRotorSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpRotorSpeedRPM.ovData = value;
+        bloodPumpRotorSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredBloodPumpSpeedOverride and testResetMeasuredBloodPumpSpeedOverride
+ * @brief
+ * The testResetMeasuredBloodPumpRotorSpeedOverride function resets the override of the \n
+ * measured blood pump rotor speed.
+ * @details
+ * Inputs : none
+ * Outputs : bloodPumpRotorSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredBloodPumpRotorSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpRotorSpeedRPM.override = OVERRIDE_RESET;
+        bloodPumpRotorSpeedRPM.ovData = bloodPumpRotorSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredBloodPumpSpeedOverride function overrides the measured \n
- * blood pump motor speed. \n
- * The testResetMeasuredBloodPumpSpeedOverride function resets the override of the \n
- * measured blood pump motor speed.
+ * blood pump motor speed.
  * @details
  * Inputs : none
  * Outputs : bloodPumpSpeedRPM
  * @param value : override measured blood pump motor speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodPumpSpeedOverride, testResetMeasuredBloodPumpSpeedOverride, bloodPumpSpeedRPM )
+BOOL testSetMeasuredBloodPumpSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpSpeedRPM.ovData = value;
+        bloodPumpSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredBloodPumpMCSpeedOverride and testResetMeasuredBloodPumpMCSpeedOverride
- * The testSetMeasuredBloodPumpMCSpeedOverride function overrides the measured \n
- * blood pump motor speed. \n
- * The testResetMeasuredBloodPumpMCSpeedOverride function resets the override of the \n
+ * @brief
+ * The testResetMeasuredBloodPumpSpeedOverride function resets the override of the \n
  * measured blood pump motor speed.
  * @details
  * Inputs : none
+ * Outputs : bloodPumpSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredBloodPumpSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpSpeedRPM.override = OVERRIDE_RESET;
+        bloodPumpSpeedRPM.ovData = bloodPumpSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
+ * The testSetMeasuredBloodPumpMCSpeedOverride function overrides the measured \n
+ * blood pump motor speed.
+ * @details
+ * Inputs : none
  * Outputs : adcBloodPumpMCSpeedRPM
  * @param value : override measured blood pump speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodPumpMCSpeedOverride, testResetMeasuredBloodPumpMCSpeedOverride, adcBloodPumpMCSpeedRPM )
+BOOL testSetMeasuredBloodPumpMCSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcBloodPumpMCSpeedRPM.ovData = value;
+        adcBloodPumpMCSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredBloodPumpMCCurrentOverride and testResetMeasuredBloodPumpMCCurrentOverride
+ * @brief
+ * The testResetMeasuredBloodPumpMCSpeedOverride function resets the override of the \n
+ * measured blood pump motor speed.
+ * @details
+ * Inputs : none
+ * Outputs : adcBloodPumpMCSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredBloodPumpMCSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcBloodPumpMCSpeedRPM.override = OVERRIDE_RESET;
+        adcBloodPumpMCSpeedRPM.ovData = adcBloodPumpMCSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredBloodPumpMCCurrentOverride function overrides the measured \n
- * blood pump motor current. \n
- * The testResetMeasuredBloodPumpMCCurrentOverride function resets the override of the \n
- * measured blood pump motor current.
+ * blood pump motor current.
  * @details
  * Inputs : none
  * Outputs : adcBloodPumpMCCurrentmA
  * @param value : override measured blood pump current (in mA)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodPumpMCCurrentOverride, testResetMeasuredBloodPumpMCCurrentOverride, adcBloodPumpMCCurrentmA )
+BOOL testSetMeasuredBloodPumpMCCurrentOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcBloodPumpMCCurrentmA.ovData = value;
+        adcBloodPumpMCCurrentmA.override = OVERRIDE_KEY;
+    }
 
+    return result;
+}
+
+/*************************************************************************
+ * @brief
+ * The testResetMeasuredBloodPumpMCCurrentOverride function resets the override of the \n
+ * measured blood pump motor current.
+ * @details
+ * Inputs : none
+ * Outputs : adcBloodPumpMCCurrentmA
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredBloodPumpMCCurrentOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcBloodPumpMCCurrentmA.override = OVERRIDE_RESET;
+        adcBloodPumpMCCurrentmA.ovData = adcBloodPumpMCCurrentmA.ovInitData;
+    }
+
+    return result;
+}
+
+