Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -raa4db7d76566ad7473f896e543f71fdbbc921ea9
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision aa4db7d76566ad7473f896e543f71fdbbc921ea9)
@@ -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.
@@ -173,7 +172,6 @@
     initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_HIGH, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR, 0, PRES_ALARM_PERSISTENCE );
-    initPersistentAlarm( ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE, 0, PRES_ALARM_PERSISTENCE );
@@ -401,13 +399,6 @@
 #endif
     }
 
-    // Check venous pressure sensor temperature
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE,
-                                             ( venTemp > VENOUS_PRESSURE_MAX_TEMP || venTemp < VENOUS_PRESSURE_MIN_TEMP ) ) )
-    {
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT, venTemp )
-    }
-
     // Filter inline pressure readings
     filterInlinePressureReadings( getMeasuredArterialPressure(), getMeasuredVenousPressure() );
 }
@@ -555,11 +546,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 );
     }
@@ -570,7 +562,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 );
     }