Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r6015f14d02e1b0dd73b2bed1d9ac84a83a20172e -r75e1ae332d1446dddf9b8d4ce6e8317449c57d67
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 6015f14d02e1b0dd73b2bed1d9ac84a83a20172e)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 75e1ae332d1446dddf9b8d4ce6e8317449c57d67)
@@ -146,15 +146,10 @@
 static F32 shortFilteredArterialPressure;                                       ///< Measured arterial pressure after short (1 s) filter.
 static F32 shortFilteredVenousPressure;                                         ///< Measured venous pressure after short (1 s) filter.
 
-static U32 airPumpOpenToleranceTimer;                                           ///< Timer for increased maximum venous high limit.
-
 static U32 bloodPumpOcclusionAfterCartridgeInstall;                             ///< Measured blood pump occlusion reading taken after cartridge install.
 
 static U32 emptySalineBagCtr = 0;                                               ///< Timer counter for empty bag detection.
 
-static U08 lastBPOcclReadCtr;                                                   ///< Previous BP occlusion sensor read count.
-static U08 lastBPErrorCtr;                                                      ///< Previous BP error count.
-
 static F32 artPressureReadingsLong[ SIZE_OF_LONG_ART_ROLLING_AVG ];             ///< Holds flow samples for long arterial pressure rolling average.
 static U32 artPressureReadingsLongIdx = 0;                                      ///< Index for next sample in rolling average array.
 static F32 artPressureReadingsLongTotal = 0.0;                                  ///< Rolling total - used to calc average.
@@ -212,28 +207,13 @@
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_VENOUS_PRESSURE_SESNOR, ALARM_ID_HD_VENOUS_SENSOR_FPGA_FAULT,
                              PRES_SENSORS_FPGA_ERROR_TIMEOUT_MS, PRES_SENSORS_FPGA_ERROR_TIMEOUT_MS );
 
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-    {
-        lastBPOcclReadCtr = 0;
-        lastBPErrorCtr    = 0;
-    }
-
     longFilteredArterialPressure        = 0.0F;
     shortFilteredArterialPressure       = 0.0F;
     shortFilteredVenousPressure         = 0.0F;
     presOcclDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     presOcclState                       = PRESSURE_WAIT_FOR_POST_STATE;
     presOcclPostState                   = PRESSURE_SELF_TEST_STATE_START;
-    airPumpOpenToleranceTimer           = 0;
-
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-    {
-        bloodPumpOcclusionAfterCartridgeInstall = 0;
-    }
+    bloodPumpOcclusionAfterCartridgeInstall = 0;
 }
 
 /*********************************************************************//**
@@ -459,15 +439,6 @@
 
     // Record occlusion sensor readings
     bloodPumpOcclusion.data = (U32)getFPGABloodPumpOcclusion();
-
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-    {
-        // Record occlusion read and error counters for next time around
-        lastBPOcclReadCtr = bpReadCtr;
-        lastBPErrorCtr    = bpErrorCtr;
-    }
 }
 
 /*********************************************************************//**
@@ -486,16 +457,20 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ARTERIAL_PRESSURE_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        // Check arterial pressure is in range
+        TREATMENT_STATE_T txState = getTreatmentState();
+
+        // Check arterial pressure is in absolute max range
         if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE,
                                                  ( artPres > ARTERIAL_PRESSURE_MAX_MMHG || artPres < ARTERIAL_PRESSURE_MIN_MMHG ) ) )
         {
             SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE, artPres );
         }
 
-        // Check arterial pressure during treatment mode
+        // Check arterial pressure during treatment mode against either user set limits or fixed max limits depending on treatment state
         if ( ( MODE_TREA == getCurrentOperationMode() ) &&
-             ( TREATMENT_DIALYSIS_STATE == getTreatmentState() ) && ( getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
+             ( ( ( TREATMENT_DIALYSIS_STATE == txState ) && ( getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) ) ||
+               ( ( TREATMENT_STOP_STATE == txState ) && ( TRUE == isBloodPumpRunning() ) ) ||
+               ( TREATMENT_BLOOD_PRIME_STATE == txState ) ) )
         {
             F32 artLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
             F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
@@ -550,15 +525,19 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_VENOUS_PRESSURE_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        // Check venous pressure is in range
+        TREATMENT_STATE_T txState = getTreatmentState();
+
+        // Check venous pressure is in absolute max range
         if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, ( venPres > VENOUS_PRESSURE_MAX_MMHG || venPres < VENOUS_PRESSURE_MIN_MMHG ) ) )
         {
             SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres );
         }
 
-        // Check venous pressure during treatment mode
-        if ( MODE_TREA == getCurrentOperationMode() &&
-             TREATMENT_DIALYSIS_STATE == getTreatmentState() && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE )
+        // Check venous pressure during treatment mode against either user set limits or fixed max limits depending on treatment state
+        if ( ( MODE_TREA == getCurrentOperationMode() ) &&
+             ( ( ( TREATMENT_DIALYSIS_STATE == txState ) && ( getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) ) ||
+               ( ( TREATMENT_STOP_STATE == txState ) && ( TRUE == isBloodPumpRunning() ) ) ||
+               ( TREATMENT_BLOOD_PRIME_STATE == txState ) ) )
         {
             F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
             F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
@@ -652,7 +631,7 @@
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
                 {
                     signalBloodPumpHardStop();  // Stop pump immediately
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl, OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall )
                 }
             }
         }
@@ -666,7 +645,7 @@
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
                 {
                     signalBloodPumpHardStop();  // Stop pump immediately
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl, OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall )
                 }
             }
         }
@@ -885,12 +864,12 @@
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE, bpPressure );
         }
 
-        if ( ( arterialPressure <= ARTERIAL_PRESSURE_SELF_TEST_MIN ) || ( arterialPressure >= ARTERIAL_PRESSURE_SELF_TEST_MAX ) )
+        if ( ( arterialPressure < ARTERIAL_PRESSURE_SELF_TEST_MIN ) || ( arterialPressure > ARTERIAL_PRESSURE_SELF_TEST_MAX ) )
         {
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE, arterialPressure );
         }
 
-        if ( ( venousPressure <= VENOUS_PRESSURE_SELF_TEST_MIN ) || ( venousPressure >= VENOUS_PRESSURE_SELF_TEST_MAX ) )
+        if ( ( venousPressure < VENOUS_PRESSURE_SELF_TEST_MIN ) || ( venousPressure > VENOUS_PRESSURE_SELF_TEST_MAX ) )
         {
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE, venousPressure );
         }
@@ -914,7 +893,7 @@
     {
         U32 const bpPressure = getMeasuredBloodPumpOcclusion();
 
-        if ( ( bpPressure <= CARTRIDGE_LOADED_THRESHOLD ) || ( bpPressure >= OCCLUSION_CARTRIDGE_LOADED_PRESSURE_READING_MAX ) )
+        if ( ( bpPressure < CARTRIDGE_LOADED_THRESHOLD ) || ( bpPressure > OCCLUSION_CARTRIDGE_LOADED_PRESSURE_READING_MAX ) )
         {
             activateAlarmNoData( ALARM_ID_NO_CARTRIDGE_LOADED );
             result = SELF_TEST_STATUS_FAILED;