Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r65577eed4749f34d800023083ecca32bd477552a -r9848d793638e2f613678e60ea7c0f1e7bc31d9eb
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 65577eed4749f34d800023083ecca32bd477552a)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 9848d793638e2f613678e60ea7c0f1e7bc31d9eb)
@@ -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
@@ -59,11 +59,13 @@
 #define ARTERIAL_PRESSURE_SELF_TEST_MAX     ( 100.0F )                                      ///< Maximum self-test value for arterial pressure sensor reading (in mmHg).
 #define ARTERIAL_PRESSURE_MAX_MMHG          ( 2000.0F )                                     ///< Maximum arterial pressure reading (in mmHg) for range check.
 #define ARTERIAL_PRESSURE_MIN_MMHG          ( -1500.0F )                                    ///< Minimum arterial pressure reading (in mmHg) for range check.
+#define ARTERIAL_PRESSURE_ND_MIN_MMHG       ( -250.0F )                                     ///< Minimum arterial pressure reading (in mmHg) when not dialyzing.
 
 #define VENOUS_PRESSURE_SELF_TEST_MIN       ( -100.0F )                                     ///< Minimum self-test value for venous pressure sensor reading (in mmHg).
 #define VENOUS_PRESSURE_SELF_TEST_MAX       ( 600.0F )                                      ///< Maximum self-test value for venous pressure sensor reading (in mmHg).
 #define VENOUS_PRESSURE_MAX_MMHG            ( 2000.0F )                                     ///< Maximum venous pressure reading (in mmHg) for range check.
 #define VENOUS_PRESSURE_MIN_MMHG            ( -1500.0F )                                    ///< Minimum venous pressure reading (in mmHg) for range check.
+#define VENOUS_PRESSURE_ND_MAX_MMHG         ( 300.0F )                                      ///< Maximum venous pressure reading (in mmHg) when not dialyzing.
 
 #define PSI_TO_MMHG                         ( 51.7149F )                                    ///< Conversion factor for converting PSI to mmHg.
 
@@ -186,8 +188,6 @@
     initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT, 0, PRES_ALARM_PERSISTENCE );
-
-
     initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_LOW, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_HIGH, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_LOW, 0, PRES_ALARM_PERSISTENCE );
@@ -587,7 +587,8 @@
         }
 
         // Check arterial pressure during treatment mode
-        if ( ( MODE_TREA == getCurrentOperationMode() ) && ( getTreatmentState() <= TREATMENT_DIALYSIS_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 );
@@ -610,6 +611,14 @@
                 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
+        {
+            // Check arterial pressure is within non-treatment alarm limits
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres < ARTERIAL_PRESSURE_ND_MIN_MMHG ) )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres, ARTERIAL_PRESSURE_ND_MIN_MMHG );
+            }
+        }
         else
         {   // Reset persistence if alarm is out of scope
             isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, FALSE );
@@ -642,7 +651,8 @@
         }
 
         // Check venous pressure during treatment mode
-        if ( ( MODE_TREA == getCurrentOperationMode() ) && ( getTreatmentState() <= TREATMENT_DIALYSIS_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 );
@@ -672,6 +682,14 @@
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
             }
         }
+        else if ( MODE_TREA == getCurrentOperationMode() )  // All treatment states not covered by the if statement above
+        {
+            // Check venous pressure is less than non-treatment alarm limit
+            if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres > VENOUS_PRESSURE_ND_MAX_MMHG ) )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, VENOUS_PRESSURE_ND_MAX_MMHG );
+            }
+        }
         else
         {   // Reset persistence if alarm is out of scope
             isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, FALSE );