Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r48e04caf56eea9eb0580ec3631a04af0524f9f16 -rbb5280946ac08388b456c7c1848d7797c4a28038
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 48e04caf56eea9eb0580ec3631a04af0524f9f16)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision bb5280946ac08388b456c7c1848d7797c4a28038)
@@ -7,8 +7,8 @@
 *
 * @file    PresOccl.c
 *
-* @author  (last)      Darren Cox
-* @date    (last)      10-Mar-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      13-Jun-2022
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -423,8 +423,8 @@
 
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) )
-    {
 #endif
+    {
         if ( ARTERIAL_PRESSURE_NORMAL_OP == artPresStatus )
         {
             U08 artReadCtr = getFPGADVTArterialPressureReadCounter();
@@ -453,8 +453,8 @@
 
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) != SW_CONFIG_ENABLE_VALUE )
-    {
 #endif
+    {
         if ( 0 == artPresAlarm )
         {
             U08 artReadCtr  = getFPGAArterialPressureReadCounter();
@@ -587,9 +587,8 @@
         }
 
         // Check arterial pressure during treatment mode
-        if ( ( MODE_TREA == getCurrentOperationMode() ) &&
-                ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
-            // Note: do we want this alarm to be on during TREATMENT_BLOOD_PRIME_STATE?
+        if ( MODE_TREA == getCurrentOperationMode() &&
+             TREATMENT_DIALYSIS_STATE == getTreatmentState()  && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE )
         {
             F32 artLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
             F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
@@ -652,8 +651,8 @@
         }
 
         // Check venous pressure during treatment mode
-        if ( ( MODE_TREA == getCurrentOperationMode() ) &&
-                ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
+        if ( MODE_TREA == getCurrentOperationMode() &&
+             TREATMENT_DIALYSIS_STATE == getTreatmentState() && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE )
         {
             F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
             F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );