Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -rdb3ad11a6c257fe9ff2ef5f1b887c47574d8fd4e -ra940a0e8fac8a3f43af9eba55abc4d781d539504
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision db3ad11a6c257fe9ff2ef5f1b887c47574d8fd4e)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision a940a0e8fac8a3f43af9eba55abc4d781d539504)
@@ -470,42 +470,45 @@
     F32 artPres = getFilteredArterialPressure();
 
 #ifndef DISABLE_ARTERIAL_PRESSURE_CHECK
-    // Check arterial pressure is in range
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE,
-                                             ( artPres > ARTERIAL_PRESSURE_MAX_MMHG || artPres < ARTERIAL_PRESSURE_MIN_MMHG ) ) )
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ARTERIAL_PRESSURE_CHECK ) != SW_CONFIG_ENABLE_VALUE )
     {
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE, artPres );
-    }
-
-    // Check arterial pressure during treatment mode
-    if ( ( MODE_TREA == getCurrentOperationMode() ) && ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE ) )
-    {
-        F32 artLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
-        F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
-
-        // If BP is ramping up, extend range to outer limits as pressure may not yet have reached expected range.
-        if ( isBloodPumpRampComplete() != TRUE )
+        // Check arterial pressure is in range
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE,
+                                                 ( artPres > ARTERIAL_PRESSURE_MAX_MMHG || artPres < ARTERIAL_PRESSURE_MIN_MMHG ) ) )
         {
-            artLowLimit = (F32)getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
-            artHighLimit = (F32)getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE, artPres );
         }
 
-        // Check arterial pressure is within user set alarm limits
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres < artLowLimit ) )
+        // Check arterial pressure during treatment mode
+        if ( ( MODE_TREA == getCurrentOperationMode() ) && ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE ) )
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres, artLowLimit );
-        }
+            F32 artLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
+            F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
 
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres > artHighLimit ) )
-        {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres, artHighLimit );
+            // If BP is ramping up, extend range to outer limits as pressure may not yet have reached expected range.
+            if ( isBloodPumpRampComplete() != TRUE )
+            {
+                artLowLimit = (F32)getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
+                artHighLimit = (F32)getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
+            }
+
+            // Check arterial pressure is within user set alarm limits
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres < artLowLimit ) )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres, artLowLimit );
+            }
+
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres > artHighLimit ) )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres, artHighLimit );
+            }
         }
+        else
+        {   // Reset persistence if alarm is out of scope
+            isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, FALSE );
+            isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, FALSE );
+        }
     }
-    else
-    {   // Reset persistence if alarm is out of scope
-        isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, FALSE );
-        isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, FALSE );
-    }
 #endif
 }
 
@@ -522,49 +525,53 @@
     F32 venPres = getFilteredVenousPressure();
 
 #ifndef DISABLE_VENOUS_PRESSURE_CHECK
-    // Check venous pressure is in range
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres > VENOUS_PRESSURE_MAX_MMHG ) ||
-         TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres < VENOUS_PRESSURE_MIN_MMHG ) )
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_VENOUS_PRESSURE_CHECK ) != SW_CONFIG_ENABLE_VALUE )
     {
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres );
-    }
-
-    // Check venous pressure during treatment mode
-    if ( ( MODE_TREA == getCurrentOperationMode() ) && ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE ) )
-    {
-        F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
-        F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
-
-        // If BP is ramping up, extend range to outer limits as pressure may not yet have reached expected range.
-        if ( isBloodPumpRampComplete() != TRUE )
+        // Check venous pressure is in range
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres > VENOUS_PRESSURE_MAX_MMHG ) ||
+             TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres < VENOUS_PRESSURE_MIN_MMHG ) )
         {
             venLowLimit = MIN_VENOUS_PRESSURE_FOR_RAMP_MMHG;
             venHighLimit = (F32)getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
         }
 
-        // Cannot monitor for low venous pressure while venting air trap
-        if ( getValveAirTrapStatus() != STATE_OPEN )
+        // Check venous pressure during treatment mode
+        if ( ( MODE_TREA == getCurrentOperationMode() ) && ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE ) )
         {
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, venPres < venLowLimit ) )
+            F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
+            F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
+
+            // If BP is ramping up, extend range to outer limits as pressure may not yet have reached expected range.
+            if ( isBloodPumpRampComplete() != TRUE )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_LOW, venPres, venLowLimit );
+                venLowLimit = (F32)getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
+                venHighLimit = (F32)getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
             }
+
+            // Cannot monitor for low venous pressure while venting air trap
+            if ( getValveAirTrapStatus() != STATE_OPEN )
+            {
+                if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, venPres < venLowLimit ) )
+                {
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_LOW, venPres, venLowLimit );
+                }
+            }
+            else
+            {   // clear persistence if air trap valve is open
+                isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, FALSE );
+            }
+
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres > venHighLimit ) )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
+            }
         }
         else
-        {   // clear persistence if air trap valve is open
+        {   // Reset persistence if alarm is out of scope
             isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, FALSE );
+            isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, FALSE );
         }
-
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres > venHighLimit ) )
-        {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
-        }
     }
-    else
-    {   // Reset persistence if alarm is out of scope
-        isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, FALSE );
-        isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, FALSE );
-    }
 #endif
 }