Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r054fa08b67ed2a31f7848b179fbcd1b4da501b0f -r6463655c18b173e335b6d475ac7289336f1bf092
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 054fa08b67ed2a31f7848b179fbcd1b4da501b0f)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 6463655c18b173e335b6d475ac7289336f1bf092)
@@ -983,73 +983,238 @@
 }
 
 /*************************************************************************
- * @brief testSetMeasuredDialInFlowRateOverride and testResetMeasuredDialInFlowRateOverride
+ * @brief
  * The testResetMeasuredDialInFlowRateOverride function overrides the measured \n
- * dialIn flow rate. \n
- * The testResetOffButtonStateOverride function resets the override of the \n
- * measured dialIn flow rate.
+ * dialIn flow rate.
  * @details
  * Inputs : none
  * Outputs : measuredDialInFlowRate
  * @param value : override measured dialIn flow rate (in mL/min)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredDialInFlowRateOverride, testResetMeasuredDialInFlowRateOverride, measuredDialInFlowRate )
+BOOL testSetMeasuredDialInFlowRateOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        measuredDialInFlowRate.ovData = value;
+        measuredDialInFlowRate.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredDialInPumpRotorSpeedOverride and testResetMeasuredDialInPumpRotorSpeedOverride
+ * @brief
+ * The testResetMeasuredDialInFlowRateOverride function resets the override of the \n
+ * measured dialIn flow rate.
+ * @details
+ * Inputs : none
+ * Outputs : measuredDialInFlowRate
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredDialInFlowRateOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        measuredDialInFlowRate.override = OVERRIDE_RESET;
+        measuredDialInFlowRate.ovData = measuredDialInFlowRate.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredDialInPumpRotorSpeedOverride function overrides the measured \n
- * dialIn pump rotor speed. \n
- * The testResetMeasuredDialInPumpRotorSpeedOverride function resets the override of the \n
- * measured dialIn pump rotor speed.
+ * dialIn pump rotor speed.
  * @details
  * Inputs : none
  * Outputs : dialInPumpRotorSpeedRPM
  * @param value : override measured dialIn pump rotor speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredDialInPumpRotorSpeedOverride, testResetMeasuredDialInPumpRotorSpeedOverride, dialInPumpRotorSpeedRPM )
+BOOL testSetMeasuredDialInPumpRotorSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpRotorSpeedRPM.ovData = value;
+        dialInPumpRotorSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredDialInPumpSpeedOverride and testResetMeasuredDialInPumpSpeedOverride
+ * @brief
+ * The testResetMeasuredDialInPumpRotorSpeedOverride function resets the override of the \n
+ * measured dialIn pump rotor speed.
+ * @details
+ * Inputs : none
+ * Outputs : dialInPumpRotorSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredDialInPumpRotorSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpRotorSpeedRPM.override = OVERRIDE_RESET;
+        dialInPumpRotorSpeedRPM.ovData = dialInPumpRotorSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredDialInPumpSpeedOverride function overrides the measured \n
- * dialIn pump motor speed. \n
- * The testResetMeasuredDialInPumpSpeedOverride function resets the override of the \n
- * measured dialIn pump motor speed.
+ * dialIn pump motor speed.
  * @details
  * Inputs : none
  * Outputs : dialInPumpSpeedRPM
  * @param value : override measured dialIn pump motor speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredDialInPumpSpeedOverride, testResetMeasuredDialInPumpSpeedOverride, dialInPumpSpeedRPM )
+BOOL testSetMeasuredDialInPumpSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpSpeedRPM.ovData = value;
+        dialInPumpSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredDialInPumpMCSpeedOverride and testResetMeasuredDialInPumpMCSpeedOverride
- * The testSetMeasuredDialInPumpMCSpeedOverride function overrides the measured \n
- * dialIn pump motor speed. \n
- * The testResetMeasuredDialInPumpMCSpeedOverride function resets the override of the \n
+ * @brief
+ * The testResetMeasuredDialInPumpSpeedOverride function resets the override of the \n
  * measured dialIn pump motor speed.
  * @details
  * Inputs : none
+ * Outputs : dialInPumpSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredDialInPumpSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpSpeedRPM.override = OVERRIDE_RESET;
+        dialInPumpSpeedRPM.ovData = dialInPumpSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
+ * The testSetMeasuredDialInPumpMCSpeedOverride function overrides the measured \n
+ * dialIn pump motor speed.
+ * @details
+ * Inputs : none
  * Outputs : adcDialInPumpMCSpeedRPM
  * @param value : override measured dialIn pump speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredDialInPumpMCSpeedOverride, testResetMeasuredDialInPumpMCSpeedOverride, adcDialInPumpMCSpeedRPM )
+BOOL testSetMeasuredDialInPumpMCSpeedOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcDialInPumpMCSpeedRPM.ovData = value;
+        adcDialInPumpMCSpeedRPM.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*************************************************************************
- * @brief testSetMeasuredDialInPumpMCCurrentOverride and testResetMeasuredDialInPumpMCCurrentOverride
+ * @brief
+ * The testResetMeasuredDialInPumpMCSpeedOverride function resets the override of the \n
+ * measured dialIn pump motor speed.
+ * @details
+ * Inputs : none
+ * Outputs : adcDialInPumpMCSpeedRPM
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredDialInPumpMCSpeedOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcDialInPumpMCSpeedRPM.override = OVERRIDE_RESET;
+        adcDialInPumpMCSpeedRPM.ovData = adcDialInPumpMCSpeedRPM.ovInitData;
+    }
+
+    return result;
+}
+
+/*************************************************************************
+ * @brief
  * The testSetMeasuredDialInPumpMCCurrentOverride function overrides the measured \n
- * dialIn pump motor current. \n
- * The testResetMeasuredDialInPumpMCCurrentOverride function resets the override of the \n
- * measured dialIn pump motor current.
+ * dialIn pump motor current.
  * @details
  * Inputs : none
  * Outputs : adcDialInPumpMCCurrentmA
  * @param value : override measured dialIn pump current (in mA)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetMeasuredDialInPumpMCCurrentOverride, testResetMeasuredDialInPumpMCCurrentOverride, adcDialInPumpMCCurrentmA )
+BOOL testSetMeasuredDialInPumpMCCurrentOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcDialInPumpMCCurrentmA.ovData = value;
+        adcDialInPumpMCCurrentmA.override = OVERRIDE_KEY;
+    }
 
+    return result;
+}
+
+/*************************************************************************
+ * @brief
+ * The testResetMeasuredDialInPumpMCCurrentOverride function resets the override of the \n
+ * measured dialIn pump motor current.
+ * @details
+ * Inputs : none
+ * Outputs : adcDialInPumpMCCurrentmA
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetMeasuredDialInPumpMCCurrentOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        adcDialInPumpMCCurrentmA.override = OVERRIDE_RESET;
+        adcDialInPumpMCCurrentmA.ovData = adcDialInPumpMCCurrentmA.ovInitData;
+    }
+
+    return result;
+}
+
+