Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -ra1132795f560349be3090090ed7f8df9543140f8
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision a1132795f560349be3090090ed7f8df9543140f8)
@@ -8,7 +8,7 @@
 * @file    PresOccl.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      26-May-2022
+* @date    (last)      13-Jul-2022
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -22,7 +22,8 @@
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
-#include "SystemCommMessages.h"
+#include "SystemCommMessages.h"
+#include "SelfTests.h"
 #include "TaskGeneral.h"
 #include "Temperatures.h"
 #include "Timers.h"
@@ -59,11 +60,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.
 
@@ -585,7 +588,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 );
@@ -608,6 +612,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 );
@@ -640,7 +652,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 );
@@ -670,6 +683,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 );
@@ -689,7 +710,7 @@
 static void checkOcclusions( void )
 {
     U32 bpOccl = getMeasuredBloodPumpOcclusion();
-    BOOL outOfRange = ( bpOccl < MIN_OCCLUSION_COUNTS || bpOccl > MAX_OCCLUSION_COUNTS ? TRUE : FALSE );
+    BOOL outOfRange = ( bpOccl < MIN_OCCLUSION_COUNTS || bpOccl > MAX_OCCLUSION_COUNTS ? TRUE : FALSE );
 
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
@@ -701,14 +722,39 @@
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, bpOccl );
         }
 
-        // Check for occlusion
-        if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
+        // Check for occlusion in PreTreatment modes when the cartridge is installed
+        // and setOcclusionInstallLevel has been called.
+        if ( MODE_PRET == getCurrentOperationMode() )
         {
-            signalBloodPumpHardStop();  // Stop pump immediately
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
+
+            if ( getPreTreatmentSubState() > HD_PRE_TREATMENT_CART_INSTALL_STATE && getDrySelfTestsState() > DRY_SELF_TESTS_START_STATE )
+            {
+                // Check for occlusion
+                if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
+                {
+                    signalBloodPumpHardStop();  // Stop pump immediately
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
+                }
+            }
         }
-        else if ( bpOccl <= ( OCCLUSION_CLEAR_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
+
+        // Check for occlusion in Treatment modes where pumps are moving
+        else if ( MODE_TREA == getCurrentOperationMode() )
         {
+            if ( TREATMENT_STOP_STATE != getTreatmentState() )
+            {
+                // Check for occlusion
+                if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
+                {
+                    signalBloodPumpHardStop();  // Stop pump immediately
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
+                }
+            }
+        }
+
+        // Clear alarm regardless of op mode once conditions are met.
+        if ( bpOccl <= ( OCCLUSION_CLEAR_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
+        {
             clearAlarmCondition( ALARM_ID_OCCLUSION_BLOOD_PUMP );
         }
     }