Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r968f9908941a8f8ceeacdb6aa40655abf54c1ef4 -r6463655c18b173e335b6d475ac7289336f1bf092
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 968f9908941a8f8ceeacdb6aa40655abf54c1ef4)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 6463655c18b173e335b6d475ac7289336f1bf092)
@@ -441,70 +441,235 @@
  * @brief
  * The testSetArterialPressureOverride function overrides the measured arterial \n
  * pressure.
- * The testResetArterialPressureOverride function resets the override of the \n
- * arterial pressure.
  * @details
  * Inputs : none
  * Outputs : arterialPressure
  * @param value : override arterial pressure (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetArterialPressureOverride, testResetArterialPressureOverride, arterialPressure )
+BOOL testSetArterialPressureOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        arterialPressure.ovData = value;
+        arterialPressure.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
+ * The testResetArterialPressureOverride function resets the override of the \n
+ * arterial pressure.
+ * @details
+ * Inputs : none
+ * Outputs : arterialPressure
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetArterialPressureOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        arterialPressure.override = OVERRIDE_RESET;
+        arterialPressure.ovData = arterialPressure.ovInitData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testSetVenousPressureOverride function overrides the measured venous \n
  * pressure.
+ * @details
+ * Inputs : none
+ * Outputs : venousPressure
+ * @param value : override measured venous pressure with (in mmHg)
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testSetVenousPressureOverride( F32 value )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        venousPressure.ovData = value;
+        venousPressure.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testResetVenousPressureOverride function resets the override of the \n
  * venous pressure.
  * @details
  * Inputs : none
  * Outputs : venousPressure
- * @param value : override measured vensous pressure with (in mmHg)
- * @return TRUE if override successful, FALSE if not
+ * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetVenousPressureOverride, testResetVenousPressureOverride, venousPressure )
+BOOL testResetVenousPressureOverride( void )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        venousPressure.override = OVERRIDE_RESET;
+        venousPressure.ovData = venousPressure.ovInitData;
+    }
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
  * The testSetBloodPumpOcclusionOverride function overrides the measured \n
- * blood pump occlusion pressure. \n
- * The testResetBloodPumpOcclusionOverride function resets the override of the \n
- * measured blood pump occlusion pressure.
+ * blood pump occlusion pressure.n
  * @details
  * Inputs : none
  * Outputs : bloodPumpOcclusion
  * @param value : override measured blood pump occlusion pressure with (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetBloodPumpOcclusionOverride, testResetBloodPumpOcclusionOverride, bloodPumpOcclusion )
+BOOL testSetBloodPumpOcclusionOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpOcclusion.ovData = value;
+        bloodPumpOcclusion.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
+ * The testResetBloodPumpOcclusionOverride function resets the override of the \n
+ * measured blood pump occlusion pressure.
+ * @details
+ * Inputs : none
+ * Outputs : bloodPumpOcclusion
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetBloodPumpOcclusionOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        bloodPumpOcclusion.override = OVERRIDE_RESET;
+        bloodPumpOcclusion.ovData = bloodPumpOcclusion.ovInitData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testSetDialInPumpOcclusionOverride function overrides the measured \n
- * dialysate inlet pump occlusion pressure. \n
- * The testResetDialInPumpOcclusionOverride function resets the override of the \n
- * measured dialysate inlet pump occlusion pressure.
+ * dialysate inlet pump occlusion pressure.n
  * @details
  * Inputs : none
  * Outputs : dialInPumpOcclusion
  * @param value : override measured dialysate inlet pump occlusion pressure (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetDialInPumpOcclusionOverride, testResetDialInPumpOcclusionOverride, dialInPumpOcclusion )
+BOOL testSetDialInPumpOcclusionOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpOcclusion.ovData = value;
+        dialInPumpOcclusion.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
+ * The testResetDialInPumpOcclusionOverride function resets the override of the \n
+ * measured dialysate inlet pump occlusion pressure.
+ * @details
+ * Inputs : none
+ * Outputs : dialInPumpOcclusion
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetDialInPumpOcclusionOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialInPumpOcclusion.override = OVERRIDE_RESET;
+        dialInPumpOcclusion.ovData = dialInPumpOcclusion.ovInitData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The testSetDialOutPumpOcclusionOverride function overrides the measured \n
- * dialysate outlet pump occlusion pressure. \n
- * The testResetDialOutPumpOcclusionOverride function resets the override of the \n
- * measured dialysate outlet pump occlusion pressure.
+ * dialysate outlet pump occlusion pressure.
  * @details
  * Inputs : none
  * Outputs : dialOutPumpOcclusion
  * @param value : override measured dialysate outlet pump occlusion pressure (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-DATA_OVERRIDE_FUNC( F32, testSetDialOutPumpOcclusionOverride, testResetDialOutPumpOcclusionOverride, dialOutPumpOcclusion )
+BOOL testSetDialOutPumpOcclusionOverride( F32 value )
+{
+    BOOL result = FALSE;
 
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialOutPumpOcclusion.ovData = value;
+        dialOutPumpOcclusion.override = OVERRIDE_KEY;
+    }
 
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetDialOutPumpOcclusionOverride function resets the override of the \n
+ * measured dialysate outlet pump occlusion pressure.
+ * @details
+ * Inputs : none
+ * Outputs : dialOutPumpOcclusion
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetDialOutPumpOcclusionOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        dialOutPumpOcclusion.override = OVERRIDE_RESET;
+        dialOutPumpOcclusion.ovData = dialOutPumpOcclusion.ovInitData;
+    }
+
+    return result;
+}
+
+