Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r34e43586567b8b43f713d28f1ce36fe781710649 -r0e2eed49c309fb01528ce5b853778336d47af165
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 34e43586567b8b43f713d28f1ce36fe781710649)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 0e2eed49c309fb01528ce5b853778336d47af165)
@@ -313,26 +313,30 @@
     F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
     F32 artPres      = getMeasuredArterialPressure();
 
-    if ( artPres < artLowLimit )  // TODO - add persistence (code & requirement)
+    // check arterial pressure during treatment mode
+    if ( MODE_TREA == getCurrentOperationMode() )
     {
+        if ( artPres < artLowLimit )  // TODO - add persistence (code & requirement)
+        {
 #ifndef DISABLE_PRESSURE_CHECKS
-        checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_LOW, TRUE, artPres, artLowLimit );
+            checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_LOW, TRUE, artPres, artLowLimit );
 #endif
-    }
-    else
-    {
-        checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_LOW, FALSE, artPres, artLowLimit );
-    }
-    if ( artPres > artHighLimit )
-    {
+        }
+        else
+        {
+            checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_LOW, FALSE, artPres, artLowLimit );
+        }
+        if ( artPres > artHighLimit )
+        {
 #ifndef DISABLE_PRESSURE_CHECKS
-        checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH, TRUE, artPres, artHighLimit );
+            checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH, TRUE, artPres, artHighLimit );
 #endif
+        }
+        else
+        {
+            checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH, FALSE, artPres, artHighLimit );
+        }
     }
-    else
-    {
-        checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH, FALSE, artPres, artHighLimit );
-    }
 }
 
 /*********************************************************************//**
@@ -349,26 +353,30 @@
     F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
     F32 venPres      = getMeasuredVenousPressure();
 
-    if ( venPres < venLowLimit )  // TODO - add persistence (code & requirement)
+    // check arterial pressure during treatment mode
+    if ( MODE_TREA == getCurrentOperationMode() )
     {
+        if ( venPres < venLowLimit )  // TODO - add persistence (code & requirement)
+        {
 #ifndef DISABLE_PRESSURE_CHECKS
-        checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_LOW, TRUE, venPres, venLowLimit );
+            checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_LOW, TRUE, venPres, venLowLimit );
 #endif
-    }
-    else
-    {
-        checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_LOW, FALSE, venPres, venLowLimit );
-    }
-    if ( venPres > venHighLimit )
-    {
+        }
+        else
+        {
+            checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_LOW, FALSE, venPres, venLowLimit );
+        }
+        if ( venPres > venHighLimit )
+        {
 #ifndef DISABLE_PRESSURE_CHECKS
-        checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH, TRUE, venPres, venHighLimit );
+            checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH, TRUE, venPres, venHighLimit );
 #endif
+        }
+        else
+        {
+            checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH, FALSE, venPres, venHighLimit );
+        }
     }
-    else
-    {
-        checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH, FALSE, venPres, venHighLimit );
-    }
 }
 
 /*********************************************************************//**