Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r89ffa1705cdf4e2d0a7be8f6cfd340f1f590e243 -r7dc68b78567c7fe7867c1a2b341e6880002a158c
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 89ffa1705cdf4e2d0a7be8f6cfd340f1f590e243)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 7dc68b78567c7fe7867c1a2b341e6880002a158c)
@@ -491,6 +491,7 @@
         {
             F32 artLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
             F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
+            BOOL artPresLow, artPresHigh;
 
             // If BP is ramping up, extend range to outer limits as pressure may not yet have reached expected range.
             if ( isBloodPumpRampComplete() != TRUE )
@@ -499,28 +500,33 @@
                 artHighLimit = (F32)getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
             }
 
+            artPresLow = ( artPres < artLowLimit ? TRUE : FALSE );
+            artPresHigh = ( artPres > artHighLimit ? TRUE : FALSE );
+
             // Check arterial pressure is within user set alarm limits
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres < artLowLimit ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPresLow ) )
             {
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres, artLowLimit );
             }
 
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres > artHighLimit ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPresHigh ) )
             {
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres, artHighLimit );
             }
         }
         else if ( MODE_TREA == getCurrentOperationMode() )  // All treatment states not covered by the if above
         {
             F32 artLowLimit  = (F32)getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
-            F32 artHighLimit = (F32)getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
+            F32 artHighLimit = (F32)getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
+            BOOL artPresLow = ( artPres < artLowLimit ? TRUE : FALSE );
+            BOOL artPresHigh = ( artPres > artHighLimit ? TRUE : FALSE );
 
             // Check arterial pressure is within max selectable range
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres < artLowLimit ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPresLow ) )
             {
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres, artLowLimit );
             }
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres > artHighLimit ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPresHigh ) )
             {
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres, artHighLimit );
             }
@@ -564,6 +570,7 @@
         {
             F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
             F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
+            BOOL venPresLow, venPresHigh;
 
             // If BP is ramping up, extend range to outer limits as pressure may not yet have reached expected range.
             if ( isBloodPumpRampComplete() != TRUE )
@@ -572,10 +579,13 @@
                 venHighLimit = (F32)getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
             }
 
+            venPresLow = ( venPres < venLowLimit ? TRUE : FALSE );
+            venPresHigh = ( venPres > venHighLimit ? TRUE : FALSE );
+
             // Cannot monitor for low venous pressure while venting air trap
             if ( getValveAirTrapStatus() != STATE_OPEN )
             {
-                if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, venPres < venLowLimit ) )
+                if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, venPresLow ) )
                 {
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_LOW, venPres, venLowLimit );
                 }
@@ -585,7 +595,7 @@
                 isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, FALSE );
             }
 
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres > venHighLimit ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPresHigh ) )
             {
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
             }
@@ -594,15 +604,17 @@
         {
             F32 venLowLimit = (F32)getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
             F32 venHighLimit = (F32)getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
+            BOOL venPresLow = ( venPres < venLowLimit ? TRUE : FALSE );
+            BOOL venPresHigh = ( venPres > venHighLimit ? TRUE : FALSE );
 
             // Check venous pressure is within max selectable range
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres > venHighLimit ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPresHigh ) )
             {
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
             }
-            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, venPres < venLowLimit ) )
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, venPresLow ) )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_LOW, venPres, venHighLimit );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_LOW, venPres, venLowLimit );
             }
         }
         else