Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r14dcf3e005ddd9acf48286f63b8561c05275b0ff -rdc7d8d337cb5f3647e3cbd1bcd054d83fbe7bd2a
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 14dcf3e005ddd9acf48286f63b8561c05275b0ff)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision dc7d8d337cb5f3647e3cbd1bcd054d83fbe7bd2a)
@@ -7,8 +7,8 @@
 *
 * @file    DialInFlow.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      12-Oct-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      18-Oct-2022
 *
 * @author  (original)  Sean
 * @date    (original)  16-Dec-2019
@@ -77,8 +77,8 @@
 static const U32 DIP_OFF_ERROR_PERSIST         = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
 /// Persist time (task intervals) motor speed error condition.
 static const U32 DIP_MOTOR_SPEED_ERROR_PERSIST = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
-/// Persist time (task intervals) rotor speed error condition.
-static const U32 DIP_ROTOR_SPEED_ERROR_PERSIST = ((12 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Rotor speed persist time test needs a minimum number of rotations.
+static const U32 DIP_ROTOR_ERROR_PERSIST_ROTATION_MIN = 3;
 /// Persist time (task intervals) pump direction error condition.
 static const U32 DIP_DIRECTION_ERROR_PERSIST   = (250 / TASK_PRIORITY_INTERVAL);
 /// Persist time (task intervals) dialysate flow rate out of range error condition.
@@ -115,7 +115,7 @@
 
 
 /// Measured dialIn flow is filtered w/ moving average.
-#define SIZE_OF_ROLLING_AVG                  10
+#define SIZE_OF_ROLLING_AVG                  4
 
 #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.
@@ -1014,6 +1014,28 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getPumpRotorErrorPersistTime function calculates the Rotor error persist time.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @param mtr_rpm, RPM of the motor.
+ *        gear_ratio, Gear ratio of motor vs motor
+ * @return Persistent error test time in (ms)
+ *************************************************************************/
+U32 getPumpRotorErrorPersistTime( F32 mtr_rpm, F32 gear_ratio )
+{
+    U32 err_persist_time = HEX_32_BIT_FULL_SCALE;  // 49 days
+
+    if ( mtr_rpm > 0 )
+    {
+        /// Calculate persist time for rotor speed error condition.
+        err_persist_time = ( ( DIP_ROTOR_ERROR_PERSIST_ROTATION_MIN / ( mtr_rpm / gear_ratio / SEC_PER_MIN ) ) * MS_PER_SECOND );
+    }
+
+   return err_persist_time;
+}
+
 /*********************************************************************//**
  * @brief
  * The publishDialInFlowData function publishes dialIn flow data at the set
@@ -1264,7 +1286,7 @@
         F32 cmdMotorSpeed = DIP_PWM_TO_MOTOR_SPEED_RPM( dialInPumpPWMDutyCyclePctSet );
         F32 deltaMotorSpeed = fabs( measMotorSpeed - cmdMotorSpeed );
         F32 deltaMCMotorSpeed = fabs( measMCMotorSpeed - cmdMotorSpeed );
-        F32 measRotorSpeed = getMeasuredDialInPumpRotorSpeed();
+        F32 measRotorSpeed = fabs( getMeasuredDialInPumpRotorSpeed() );
         F32 measMotorSpeedInRotorRPM = measMotorSpeed / DIP_GEAR_RATIO;
         F32 deltaRotorSpeed = fabs( measRotorSpeed - measMotorSpeedInRotorRPM );
 
@@ -1289,7 +1311,7 @@
         // Check measured rotor speed vs. measured motor speed while controlling to target
         if ( deltaRotorSpeed > DIP_MAX_ROTOR_VS_MOTOR_DIFF_RPM )
         {
-            if ( ++errorDialInRotorSpeedPersistTimerCtr >= DIP_ROTOR_SPEED_ERROR_PERSIST )
+            if ( ++errorDialInRotorSpeedPersistTimerCtr >= ( getPumpRotorErrorPersistTime( measMotorSpeed, DIP_GEAR_RATIO ) / TASK_PRIORITY_INTERVAL ) )
             {
 #ifndef _RELEASE_
                 if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE )