Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r959493a3f7f4731ff3433da8b09c81e0a4f48336 -r5e4306d89430fd3f347b3330e6549ebf60cb61f7
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 959493a3f7f4731ff3433da8b09c81e0a4f48336)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 5e4306d89430fd3f347b3330e6549ebf60cb61f7)
@@ -169,9 +169,9 @@
 static BOOL pressureLimitsActive;                                               ///< Flag indicates whether arterial and venous pressure alarm limits are active.
 static U32 stabilizationStartTimeMs;                                            ///< Timestamp taken when pressure limit stabilization began (ms).
 static F32 longFilteredArterialPressure;                                        ///< Measured arterial pressure after long (10 s) filter.
-static F32 shortFilteredArterialPressure;                                       ///< Measured arterial pressure after short (1 s) filter.
+static OVERRIDE_F32_T shortFilteredArterialPressure = { 0.0, 0.0, 0.0, 0 };     ///< Measured arterial pressure after short (1 s) filter.
 static F32 longFilteredVenousPressure;                                          ///< Measured venous pressure after long (10 s) filter.
-static F32 shortFilteredVenousPressure;                                         ///< Measured venous pressure after short (1 s) filter.
+static OVERRIDE_F32_T shortFilteredVenousPressure  = { 0.0, 0.0, 0.0, 0 };      ///< Measured venous pressure after short (1 s) filter.
 static BOOL useShortStabilizeTime;                                              ///< Flag to use short stabilize time.
 
 static U32 bloodPumpOcclusionAfterCartridgeInstall;                             ///< Measured blood pump occlusion reading taken after cartridge install.
@@ -253,9 +253,9 @@
     venLowPresExemptAfterAirTrapFillTimerCtr = 0;
     resetArtVenPressureOffsets();
     longFilteredArterialPressure             = 0.0F;
-    shortFilteredArterialPressure            = 0.0F;
+    shortFilteredArterialPressure.data       = 0.0F;
     longFilteredVenousPressure               = 0.0F;
-    shortFilteredVenousPressure              = 0.0F;
+    shortFilteredVenousPressure.data         = 0.0F;
     presOcclDataPublicationTimerCounter      = DATA_PUBLISH_COUNTER_START_COUNT;
     presOcclState                            = PRESSURE_WAIT_FOR_POST_STATE;
     presOcclPostState                        = PRESSURE_SELF_TEST_STATE_START;
@@ -1002,7 +1002,7 @@
  *************************************************************************/
 F32 getFilteredArterialPressure( void )
 {
-    return shortFilteredArterialPressure;
+    return getF32OverrideValue( &shortFilteredArterialPressure );
 }
 
 /*********************************************************************//**
@@ -1045,7 +1045,7 @@
  *************************************************************************/
 F32 getFilteredVenousPressure( void )
 {
-    return shortFilteredVenousPressure;
+    return getF32OverrideValue( &shortFilteredVenousPressure );
 }
 
 /*********************************************************************//**
@@ -1116,7 +1116,7 @@
     artPressureReadingsShortTotal += artPres;
     artPressureReadingsShortIdx = INC_WRAP( artPressureReadingsShortIdx, 0, SIZE_OF_SHORT_ART_ROLLING_AVG - 1 );
     artPressureReadingsShortCount = INC_CAP( artPressureReadingsShortCount, SIZE_OF_SHORT_ART_ROLLING_AVG );
-    shortFilteredArterialPressure = artPressureReadingsShortTotal / (F32)artPressureReadingsShortCount;
+    shortFilteredArterialPressure.data = artPressureReadingsShortTotal / (F32)artPressureReadingsShortCount;
 
     // Long filter for venous pressure.
     if ( venPressureReadingsLongCount >= SIZE_OF_LONG_VEN_ROLLING_AVG )
@@ -1138,7 +1138,7 @@
     venPressureReadingsShortTotal += venPres;
     venPressureReadingsShortIdx = INC_WRAP( venPressureReadingsShortIdx, 0, SIZE_OF_SHORT_VEN_ROLLING_AVG - 1 );
     venPressureReadingsShortCount = INC_CAP( artPressureReadingsShortCount, SIZE_OF_SHORT_VEN_ROLLING_AVG );
-    shortFilteredVenousPressure = venPressureReadingsShortTotal / (F32)venPressureReadingsShortCount;
+    shortFilteredVenousPressure.data = venPressureReadingsShortTotal / (F32)venPressureReadingsShortCount;
 }
 
 /*********************************************************************//**
@@ -1156,8 +1156,8 @@
     {
         PRESSURE_OCCLUSION_DATA_T data;
 
-        data.arterialPressure       = shortFilteredArterialPressure;
-        data.venousPressure         = shortFilteredVenousPressure;
+        data.arterialPressure       = getFilteredArterialPressure();
+        data.venousPressure         = getFilteredVenousPressure();
         data.bldPumpOcclusion       = getMeasuredBloodPumpOcclusion();
         data.presLimitState         = currPresLimitsState;
         data.artMinLimit            = currentArterialMinLimit;
@@ -1324,19 +1324,28 @@
  * The testSetArterialPressureOverride function overrides the measured arterial
  * pressure.
  * @details Inputs: none
- * @details Outputs: arterialPressure
+ * @details Outputs: arterialPressure, shortFilteredArterialPressure
  * @param value override arterial pressure (in mmHg)
+ * @param filtered override filtered value or raw value
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetArterialPressureOverride( F32 value )
+BOOL testSetArterialPressureOverride( F32 value, BOOL filtered )
 {
     BOOL result = FALSE;
 
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        arterialPressure.ovData = value;
-        arterialPressure.override = OVERRIDE_KEY;
+        if ( FALSE == filtered )
+        {
+            arterialPressure.ovData = value;
+            arterialPressure.override = OVERRIDE_KEY;
+        }
+        else
+        {
+            shortFilteredArterialPressure.ovData = value;
+            shortFilteredArterialPressure.override = OVERRIDE_KEY;
+        }
     }
 
     return result;
@@ -1347,18 +1356,26 @@
  * The testResetArterialPressureOverride function resets the override of the
  * arterial pressure.
  * @details Inputs: none
- * @details Outputs: arterialPressure
+ * @details Outputs: arterialPressure, shortFilteredArterialPressure
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
-BOOL testResetArterialPressureOverride( void )
+BOOL testResetArterialPressureOverride( BOOL filtered )
 {
     BOOL result = FALSE;
 
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        arterialPressure.override = OVERRIDE_RESET;
-        arterialPressure.ovData = arterialPressure.ovInitData;
+        if ( FALSE == filtered )
+        {
+            arterialPressure.override = OVERRIDE_RESET;
+            arterialPressure.ovData = arterialPressure.ovInitData;
+        }
+        else
+        {
+            shortFilteredArterialPressure.override = OVERRIDE_RESET;
+            shortFilteredArterialPressure.ovData = shortFilteredArterialPressure.ovInitData;
+        }
     }
 
     return result;
@@ -1369,19 +1386,28 @@
  * The testSetVenousPressureOverride function overrides the measured venous
  * pressure.
  * @details Inputs: none
- * @details Outputs: venousPressure
+ * @details Outputs: venousPressure, shortFilteredVenousPressure
  * @param value override measured venous pressure with (in mmHg)
+ * @param filtered override filtered value or raw value
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetVenousPressureOverride( F32 value )
+BOOL testSetVenousPressureOverride( F32 value, BOOL filtered )
 {
     BOOL result = FALSE;
 
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        venousPressure.ovData = value;
-        venousPressure.override = OVERRIDE_KEY;
+        if ( FALSE == filtered )
+        {
+            venousPressure.ovData = value;
+            venousPressure.override = OVERRIDE_KEY;
+        }
+        else
+        {
+            shortFilteredVenousPressure.ovData = value;
+            shortFilteredVenousPressure.override = OVERRIDE_KEY;
+        }
     }
 
     return result;
@@ -1392,18 +1418,26 @@
  * The testResetVenousPressureOverride function resets the override of the
  * venous pressure.
  * @details Inputs: none
- * @details Outputs: venousPressure
+ * @details Outputs: venousPressure, shortFilteredVenousPressure
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
-BOOL testResetVenousPressureOverride( void )
+BOOL testResetVenousPressureOverride( BOOL filtered )
 {
     BOOL result = FALSE;
 
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        venousPressure.override = OVERRIDE_RESET;
-        venousPressure.ovData = venousPressure.ovInitData;
+        if ( FALSE == filtered )
+        {
+            venousPressure.override = OVERRIDE_RESET;
+            venousPressure.ovData = venousPressure.ovInitData;
+        }
+        else
+        {
+            shortFilteredVenousPressure.override = OVERRIDE_RESET;
+            shortFilteredVenousPressure.ovData = shortFilteredVenousPressure.ovInitData;
+        }
     }
 
     return result;