Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r8afac005a36a62d8d36e58a4c46d0225b3367204 -rda1cfaa4f4b3ecedf2d1c70acfb48c1669275e9d
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 8afac005a36a62d8d36e58a4c46d0225b3367204)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision da1cfaa4f4b3ecedf2d1c70acfb48c1669275e9d)
@@ -98,6 +98,7 @@
 static const U32 EMPTY_SALINE_BAG_PERSISTENCE = ( 250 / TASK_GENERAL_INTERVAL );            ///< Time that saline bag looks empty before saying it is empty.
 
 #define PRES_ALARM_PERSISTENCE              ( 1 * MS_PER_SECOND )                           ///< Alarm persistence period for pressure alarms.
+#define PRES_OCCL_ALARM_PERSISTENCE         ( 3 * MS_PER_SECOND )                           ///< Alarm persistence period for occlusion alarms
 #define VEN_OCCL_ALARM_PERSISTENCE          100                                             ///< Alarm persistence period for venous occlusion alarm.
 #define AIR_PUMP_TOLERANCE_TIMEOUT_MS       (1 * MS_PER_SECOND )                            ///< Time to allow increased maximum venous high limit
 
@@ -197,7 +198,7 @@
     initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_HIGH, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, 0, PRES_ALARM_PERSISTENCE );
-    initPersistentAlarm( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, 0, PRES_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, 0, PRES_OCCL_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_VENOUS_LINE_OCCLUSION, 0, VEN_OCCL_ALARM_PERSISTENCE );
 
     // Initialize the FPGA persistent alarms
@@ -298,6 +299,7 @@
 #endif
     {
         bloodPumpOcclusionAfterCartridgeInstall = getMeasuredBloodPumpOcclusion();
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_OCCLUSION_BASELINE, bloodPumpOcclusionAfterCartridgeInstall, OCCLUSION_THRESHOLD_OFFSET );
     }
 }
 
@@ -618,7 +620,7 @@
         // Range check occlusion sensor (OB)
         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 );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, bpOccl, bloodPumpOcclusionAfterCartridgeInstall )
         }
 
         // Check for occlusion in PreTreatment modes when the cartridge is installed