Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rc4117345916148c4f48a0a83831204201444dc99 -rb1492eff71eab83d55456ad3520ccfd6cda06a77
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision c4117345916148c4f48a0a83831204201444dc99)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision b1492eff71eab83d55456ad3520ccfd6cda06a77)
@@ -118,6 +118,8 @@
 
 #define PUMP_DIR_ERROR_COUNT_MASK           0x3F            ///< Bit mask for pump direction error counter.
 #define BP_MIN_DIR_CHECK_SPEED_RPM          10.0F           ///< Minimum motor speed before we check pump direction.
+#define BP_COMMUTATION_ERROR_MAX_CNT        3               ///< Maximum number of commutation errors within time window before alarm triggered.
+#define BP_COMMUTATION_ERROR_TIME_WIN_MS    (15 * MS_PER_SECOND)    ///< Time window for BP commutation error.
 
 #define BP_FLOW_ALPHA_Y_INTERCEPT           1.1970F         ///< Y intercept used for alpha flow coefficient calculation.
 #define BP_FLOW_WEAR_A_TERM                 0.000000029F    ///< A term used for wear portion of alpha flow coefficient.
@@ -254,7 +256,7 @@
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK, 0, BP_MOTOR_SPEED_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK, 0, BP_ROTOR_SPEED_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK, 0, BP_DIRECTION_ERROR_PERSIST );
-    initPersistentAlarm( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, 0, BP_DIRECTION_ERROR_PERSIST );
+    initTimeWindowedCount( TIME_WINDOWED_COUNT_BP_COMMUTATION_ERROR, BP_COMMUTATION_ERROR_MAX_CNT, BP_COMMUTATION_ERROR_TIME_WIN_MS );
     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_HD_BLOOD_FLOW_OUT_OF_RANGE, 0, BP_MAX_FLOW_RATE_OUT_OF_RANGE_PERSIST );
@@ -1092,7 +1094,7 @@
         BOOL isHallSensorFailed = ( TRUE == minDirSpeed && lastBloodPumpDirectionCount != dirErrorCnt ? TRUE : FALSE );
 
         // Check pump direction error count
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, isHallSensorFailed ) )
+        if ( ( TRUE == isHallSensorFailed ) && ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BP_COMMUTATION_ERROR ) ) )
         {
 #ifndef _RELEASE_
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rc4117345916148c4f48a0a83831204201444dc99 -rb1492eff71eab83d55456ad3520ccfd6cda06a77
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision c4117345916148c4f48a0a83831204201444dc99)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision b1492eff71eab83d55456ad3520ccfd6cda06a77)
@@ -117,6 +117,8 @@
 
 #define PUMP_DIR_ERROR_COUNT_MASK            0x3F            ///< Bit mask for pump direction error counter.
 #define DIP_MIN_DIR_CHECK_SPEED_RPM          10.0F           ///< Minimum motor speed before we check pump direction.
+#define DIP_COMMUTATION_ERROR_MAX_CNT        3               ///< Maximum number of commutation errors within time window before alarm triggered.
+#define DIP_COMMUTATION_ERROR_TIME_WIN_MS    (15 * MS_PER_SECOND)    ///< Time window for DPi commutation error.
 
 #define DATA_PUBLISH_COUNTER_START_COUNT     30              ///< Data publish counter start count.
 
@@ -249,6 +251,7 @@
 
     // Initialize persistent alarm for flow sensor signal strength too low
     initPersistentAlarm( ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE, 0, DIP_MAX_FLOW_RATE_OUT_OF_RANGE_PERSIST );
+    initTimeWindowedCount( TIME_WINDOWED_COUNT_DIP_COMMUTATION_ERROR, DIP_COMMUTATION_ERROR_MAX_CNT, DIP_COMMUTATION_ERROR_TIME_WIN_MS );
 }
 
 /*********************************************************************//**
@@ -1028,7 +1031,7 @@
         BOOL isHallSensorFailed = ( TRUE == minDirSpeed && lastDialInPumpDirectionCount != dirErrorCnt ? TRUE : FALSE );
 
         // Check pump direction error count
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, isHallSensorFailed ) )
+        if ( ( TRUE == isHallSensorFailed ) && ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_DIP_COMMUTATION_ERROR ) ) )
         {
 #ifndef _RELEASE_
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rc4117345916148c4f48a0a83831204201444dc99 -rb1492eff71eab83d55456ad3520ccfd6cda06a77
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision c4117345916148c4f48a0a83831204201444dc99)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision b1492eff71eab83d55456ad3520ccfd6cda06a77)
@@ -111,6 +111,8 @@
 
 #define PUMP_DIR_ERROR_COUNT_MASK                0x3F           ///< Bit mask for pump direction error counter.
 #define DOP_MIN_DIR_CHECK_SPEED_RPM              10.0F          ///< Minimum motor speed before we check pump direction.
+#define DOP_COMMUTATION_ERROR_MAX_CNT            3              ///< Maximum number of commutation errors within time window before alarm triggered.
+#define DOP_COMMUTATION_ERROR_TIME_WIN_MS        (15 * MS_PER_SECOND)    ///< Time window for DPo commutation error.
 #define DATA_PUBLISH_COUNTER_START_COUNT         40             ///< Data publish counter start count.
 
 /// Enumeration of dialysate outlet pump controller states.
@@ -242,6 +244,8 @@
     ufMeasuredRate = 0.0;
     dopRateCorrectionOffset = 0.0;
     resetDialOutFlowMovingAverage();
+
+    initTimeWindowedCount( TIME_WINDOWED_COUNT_DOP_COMMUTATION_ERROR, DOP_COMMUTATION_ERROR_MAX_CNT, DOP_COMMUTATION_ERROR_TIME_WIN_MS );
 }
 
 /*********************************************************************//**
@@ -942,7 +946,7 @@
         BOOL isHallSensorFailed = ( TRUE == minDirSpeed && lastDialOutPumpDirectionCount != dirErrorCnt ? TRUE : FALSE );
 
         // Check pump direction error count
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, isHallSensorFailed ) )
+        if ( ( TRUE == isHallSensorFailed ) && ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_DOP_COMMUTATION_ERROR ) ) )
         {
 #ifndef _RELEASE_
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS ) != SW_CONFIG_ENABLE_VALUE )