Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r12837d3c857ebe42e721a86f821c2334705e87bf -rb442cce89b3fde168017fa38c6f5f799da8b4510
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 12837d3c857ebe42e721a86f821c2334705e87bf)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision b442cce89b3fde168017fa38c6f5f799da8b4510)
@@ -8,7 +8,7 @@
 * @file    BloodLeak.c
 *
 * @author  (last)      Bill Bracken
-* @date    (last)      12-May-2023
+* @date    (last)      13-Jun-2023
 *
 * @author  (original)  Peman Montazemi
 * @date    (original)  18-Mar-2021
@@ -92,6 +92,9 @@
 #define BLOOD_LEAK_FPGA_ERROR_TIMEOUT_MS     ( 2 * MS_PER_SECOND )                               ///< Blood leak embedded mode FPGA error timeout in milliseconds.
 #define BLOOD_LEAK_RXFIFO_COUNT_MASK         0x03ff                                              ///< Mask high order bits of blood leak sensor rx count
 
+#define MAX_BLOOD_LEAK_COMM_FAILURES_WINDOW_MS ( 1 * SEC_PER_MIN * MS_PER_SECOND )              ///< Blood Leak comm failures window
+#define MAX_BLOOD_LEAK_COMM_FAILURES          3                                                 ///< Blood Leak maximum comm failures per MAX_BLOOD_LEAK_COMM_FAILURES_WINDOW_MS
+
 /// Defined states for the blood leak detector state machine.
 typedef enum BloodLeakStates
 {
@@ -261,12 +264,13 @@
     // Initialize the blood leak embedded mode command sequence
     memset( bloodLeakEmbModeCmdSeq, 0x0, BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH );
 
-    initFPGAPersistentAlarm( FPGA_PERS_ERROR_BLOOD_LEAK_SENSOR, ALARM_ID_HD_BLOOD_LEAK_FPGA_FAULT,
-                             BLOOD_LEAK_FPGA_ERROR_TIMEOUT_MS, BLOOD_LEAK_FPGA_ERROR_TIMEOUT_MS );
-
     // Enqueue the commands to set the embedded mode and request the set point of the blood leak sensor
     enqueueEmbModeCmd( CS_EMB_MODE_CMD );
     enqueueEmbModeCmd( D_EMB_MODE_CMD );
+
+    // initialize FPGA comm failures windowed timer count
+    initTimeWindowedCount( TIME_WINDOWED_COUNT_BLOOD_LEAK_COMM_ERROR, MAX_BLOOD_LEAK_COMM_FAILURES, MAX_BLOOD_LEAK_COMM_FAILURES_WINDOW_MS);
+
 }
 
 /*********************************************************************//**
@@ -315,8 +319,6 @@
 
     enqueueInfoEmbModeCmds();
 
-    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_BLOOD_LEAK_SENSOR, getFPGABloodLeakRxErrorCount() );
-
     // Publish blood leak data if due
     publishBloodLeakData();
 }
@@ -666,7 +668,7 @@
     }
 
     // Check status reading and act upon
-    if ( BLOOD_LEAK_DETECTED == getBloodLeakStatus() )
+    if ( ( BLOOD_LEAK_DETECTED == getBloodLeakStatus() ) && ( MODE_TREA == getCurrentOperationMode() ) )
     {
         if ( ++bloodLeakPersistenceCtr > BLOOD_LEAK_PERSISTENCE )
         {
@@ -1041,6 +1043,11 @@
 
         bloodLeakEmbModeRqstedCmd = NU_EMB_MODE_CMD;
         state                     = BLOOD_LEAK_EMB_MODE_WAIT_FOR_COMAND_STATE;
+
+        if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BLOOD_LEAK_COMM_ERROR ) )
+        {
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_BLOOD_LEAK_FPGA_FAULT, MAX_BLOOD_LEAK_COMM_FAILURES, (U32)MAX_BLOOD_LEAK_COMM_FAILURES_WINDOW_MS )
+        }
     }
 
     return state;