Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -rb1f086e7cd292d5a97a7265075400274d60d4fbf -ra07d9c4f115d1fed3c40c129edb5125d29070920
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision b1f086e7cd292d5a97a7265075400274d60d4fbf)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision a07d9c4f115d1fed3c40c129edb5125d29070920)
@@ -405,88 +405,38 @@
     U16 venPres         = fpgaVenPres & 0x3FFF;                                 // 14-bit data
     U08 venPresStatus   = (U08)( fpgaVenPres >> SHIFT_14_BITS );                // High 2 bits is status code for venous pressure
     U08 venReadCtr      = getFPGAVenousPressureReadCounter();
+    U16 fpgaArtPres     = getFPGADVTArterialPressure();
+    U16 artPres         = fpgaArtPres & 0x3FFF;
+    rawArterialPres     = (F32)artPres;
+    artPresStatus       = (U08)( fpgaArtPres >> SHIFT_14_BITS );
 
-#ifndef _RELEASE_
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) )
-    {
-        U16 fpgaArtPres = getFPGADVTArterialPressure();
-        U16 artPres     = fpgaArtPres & 0x3FFF;
-        rawArterialPres = (F32)artPres;
-        artPresStatus   = (U08)( fpgaArtPres >> SHIFT_14_BITS );
-    }
-    else
-#endif
-    {
-        U32 fpgaArtPres = getFPGAArterialPressure();
-        S32 artPres     = (S32)( fpgaArtPres & MASK_OFF_U32_MSB ) - ARTERIAL_PRESSURE_CONVERSION_OFFSET;   // Subtract 2^23 from low 24 bits to get signed reading
-        rawArterialPres = (F32)artPres;
-        artPresAlarm    = (U08)( fpgaArtPres >> SHIFT_24_BITS );                // High byte is alarm code for arterial pressure
-    }
 
-#ifndef _RELEASE_
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) )
-#endif
+    if ( ARTERIAL_PRESSURE_NORMAL_OP == artPresStatus )
     {
-        if ( ARTERIAL_PRESSURE_NORMAL_OP == artPresStatus )
-        {
-            U08 artReadCtr = getFPGADVTArterialPressureReadCounter();
+        U08 artReadCtr = getFPGADVTArterialPressureReadCounter();
 
-            // Check for stale venous pressure reading
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, ( lastArterialPressureReadCtr == artReadCtr ) ) )
-            {
-                activateAlarmNoData( ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR );
-            }
-            // Record arterial pressure sensor read counter for next time around
-            lastArterialPressureReadCtr = artReadCtr;
-
-            arterialPressure.data = ( (F32)(rawArterialPres - ARTERIAL_PRESSURE_OFFSET) *
-                                      (ARTERIAL_PRESSURE_MAX_PSI - ARTERIAL_PRESSURE_MIN_PSI) / (F32)ARTERIAL_PRESSURE_SCALE ) + ARTERIAL_PRESSURE_MIN_PSI;
-            arterialPressure.data = arterialPressure.data * PSI_TO_MMHG;
-        }
-        else if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT, TRUE ) )
+        // Check for stale venous pressure reading
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, ( lastArterialPressureReadCtr == artReadCtr ) ) )
         {
-            activateAlarmNoData( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT );
+            activateAlarmNoData( ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR );
         }
-        else
-        {
-            resetPersistentAlarmTimer( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT );
-        }
-    }
+        // Record arterial pressure sensor read counter for next time around
+        lastArterialPressureReadCtr = artReadCtr;
 
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) != SW_CONFIG_ENABLE_VALUE )
-#endif
+        arterialPressure.data = ( (F32)(rawArterialPres - ARTERIAL_PRESSURE_OFFSET) *
+                                  (ARTERIAL_PRESSURE_MAX_PSI - ARTERIAL_PRESSURE_MIN_PSI) / (F32)ARTERIAL_PRESSURE_SCALE ) + ARTERIAL_PRESSURE_MIN_PSI;
+        arterialPressure.data = arterialPressure.data * PSI_TO_MMHG;
+    }
+    else if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT, TRUE ) )
     {
-        if ( 0 == artPresAlarm )
-        {
-            U08 artReadCtr  = getFPGAArterialPressureReadCounter();
-            U08 artErrorCtr = getFPGAArterialPressureErrorCounter();
-
-            // Check for stale arterial pressure reading
-            // TODO I think we should check the change of the error count not if it is greater than 0?
-            if ( FALSE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, ( lastArterialPressureReadCtr == artReadCtr || artErrorCtr > 0 ) ) )
-            {
-                arterialPressure.data = ARTERIAL_PRESSURE_V_PER_BIT * ( rawArterialPres / ( ARTERIAL_PRESSURE_SENSITIVITY * ARTERIAL_PRESSURE_V_BIAS ) ) +
-                                        getF32OverrideValue( &arterialPressureOffset );
-            }
-            else
-            {
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, (U32)artErrorCtr );
-            }
-            // Record arterial pressure sensor read counter for next time around
-            lastArterialPressureReadCtr = artReadCtr;
-        }
-        else
-        {
-#ifndef _RELEASE_
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-            {
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT, (U32)artPresAlarm )
-            }
-        }
+        activateAlarmNoData( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT );
     }
+    else
+    {
+        resetPersistentAlarmTimer( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT );
+    }
 
+
     // Check for stale venous pressure reading
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR, ( lastVenousPressureReadCtr == venReadCtr ) ) )
     {
@@ -496,7 +446,7 @@
     lastVenousPressureReadCtr = venReadCtr;
 
     // Convert venous pressure to PSI and then mmHg
-    venPresPSI = ( (F32)(venPres - VENOUS_PRESSURE_OFFSET) * (VENOUS_PRESSURE_MAX_PSI - VENOUS_PRESSURE_MIN_PSI) / (F32)VENOUS_PRESSURE_SCALE ) +
+    venPresPSI = ( (F32)( venPres - VENOUS_PRESSURE_OFFSET ) * ( VENOUS_PRESSURE_MAX_PSI - VENOUS_PRESSURE_MIN_PSI ) / (F32)VENOUS_PRESSURE_SCALE ) +
                    VENOUS_PRESSURE_MIN_PSI;
 
     // Convert venous pressure from PSI to mmHg if sensor status is normal