Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r511d3ffe16427c8f275d46fca1e3ff3fb83fe54a
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 511d3ffe16427c8f275d46fca1e3ff3fb83fe54a)
@@ -59,20 +59,19 @@
 #define VENOUS_PRESSURE_MIN_TEMP            ( 0.0 )                                         ///< Minimum venous pressure sensor temperature.
 #define VENOUS_PRESSURE_MAX_TEMP            ( 80.0 )                                        ///< Maximum venous pressure sensor temperature.
 
-#define MIN_OCCLUSION_COUNTS                ( 2000 )                                        ///< Minimum occlusion sensor reading for range check.
-
 #define PSI_TO_MMHG                         ( 51.7149 )                                     ///< Conversion factor for converting PSI to mmHg.
 
 #define VENOUS_PRESSURE_NORMAL_OP           0                                               ///< Venous pressure status bits indicate normal operation.
 #define VENOUS_PRESSURE_CMD_MODE            1                                               ///< Venous pressure status bits indicate sensor in command mode.
 #define VENOUS_PRESSURE_STALE_DATA          2                                               ///< Venous pressure status bits indicate data is stale (no new data since last fpga read).
 #define VENOUS_PRESSURE_DIAG_CONDITION      3                                               ///< Venous pressure status bits diagnostic condition (alarm).
 
-#define OCCLUSION_THRESHOLD_OFFSET          10000                                           ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived above which an occlusion is detected.
-#define OCCLUSION_CLEAR_THRESHOLD_OFFSET    6000                                            ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived below which an occlusion is cleared.
+#define OCCLUSION_THRESHOLD_OFFSET          4000                                            ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived above which an occlusion is detected.
+#define OCCLUSION_CLEAR_THRESHOLD_OFFSET    4000                                            ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived below which an occlusion is cleared.
 #define CARTRIDGE_LOADED_THRESHOLD          5000                                            ///< Threshold above which a cartridge is considered loaded.
-/// Occlusion sensors maximum pressure reading limit when cartridge is considered loaded.
-#define OCCLUSION_CARTRIDGE_LOADED_PRESSURE_READING_MAX         20000
+#define MIN_OCCLUSION_COUNTS                2000                                            ///< Minimum occlusion sensor reading for range check.
+#define MAX_OCCLUSION_COUNTS                32766                                           ///< Maximum occlusion sensor reading for range check.
+#define OCCLUSION_CARTRIDGE_LOADED_PRESSURE_READING_MAX         26000                       ///< Occlusion sensors maximum pressure reading limit when cartridge is considered loaded.
 
 #define EMPTY_SALINE_BAG_THRESHOLD_MMHG     -300.0                                          ///< Threshold below which the saline bag is considered empty (in mmHg).  TODO - get real threshold from Systems
 static const U32 EMPTY_SALINE_BAG_PERSISTENCE = ( 250 / TASK_GENERAL_INTERVAL );            ///< Time that saline bag looks empty before saying it is empty.
@@ -563,11 +562,12 @@
  *************************************************************************/
 static void checkOcclusions( void )
 {
-    U32 bpOccl = getMeasuredBloodPumpOcclusion();
+    U32 bpOccl = getMeasuredBloodPumpOcclusion();
+    BOOL outOfRange = ( bpOccl < MIN_OCCLUSION_COUNTS || bpOccl > MAX_OCCLUSION_COUNTS ? TRUE : FALSE );
 
 #ifndef DISABLE_PRESSURE_CHECKS
     // Range check occlusion sensor
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, bpOccl < MIN_OCCLUSION_COUNTS ) )
+    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, outOfRange ) )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, bpOccl );
     }
@@ -578,7 +578,7 @@
         signalBloodPumpHardStop();  // Stop pump immediately
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
     }
-    else if ( bpOccl < ( OCCLUSION_CLEAR_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
+    else if ( bpOccl <= ( OCCLUSION_CLEAR_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
     {
         clearAlarmCondition( ALARM_ID_OCCLUSION_BLOOD_PUMP );
     }