Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -r31785f24396cebed8e10834f56fc2668783558e6
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 31785f24396cebed8e10834f56fc2668783558e6)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file BloodFlow.c
+* @file    BloodFlow.c
 *
-* @author (last) Sean Nash
-* @date (last) 13-Oct-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      06-Nov-2021
 *
-* @author (original) Sean Nash
-* @date (original) 07-Nov-2019
+* @author  (original)  Sean Nash
+* @date    (original)  07-Nov-2019
 *
 ***************************************************************************/
 
@@ -257,9 +257,6 @@
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, BP_MAX_ROTOR_SPEED_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, 0, BP_MAX_CURR_ERROR_DURATION_MS );
     initPersistentAlarm( ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST );
-    initPersistentAlarm( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, 0, BLOOD_FLOW_FAST_READ_TO_PERSIST );
-    initPersistentAlarm( ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR, 0, BLOOD_FLOW_SLOW_READ_TO_PERSIST );
-    initPersistentAlarm( ALARM_ID_HD_BP_FLOW_SENSOR_ERROR, 0, BLOOD_FLOW_COMM_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, 0, BP_MAX_FLOW_RATE_OUT_OF_RANGE_PERSIST );
 }
 
@@ -472,30 +469,12 @@
                      fpgaBloodFlow     * bloodFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].gain +
                                          bloodFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].offset;
 
-#ifndef DISABLE_PUMP_FLOW_CHECKS
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_FLOW_SENSOR_ERROR, ( flowErrorCtr != lastBloodFlowCommErrorCount ) ) )
-    {
-        activateAlarmNoData( ALARM_ID_HD_BP_FLOW_SENSOR_ERROR );
-    }
     if ( flowStatus != BFM_SENSOR_CONNECTED_STATUS )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE, (U32)flowStatus );
     }
     lastBloodFlowCommErrorCount = flowErrorCtr;
-#endif
 
-#ifndef DISABLE_FPGA_COUNTER_CHECKS
-    // Check for stale flow reading
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, ( fpReadCtr == lastBloodFlowFastPacketReadCtr ) ) )
-    {
-        activateAlarmNoData( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR );
-    }
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR, ( spReadCtr == lastBloodFlowSlowPacketReadCtr ) ) )
-    {
-        activateAlarmNoData( ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR );
-    }
-#endif
-
     // Record flow read counters for next time around
     lastBloodFlowFastPacketReadCtr = fpReadCtr;
     lastBloodFlowSlowPacketReadCtr = spReadCtr;