Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rfb1673d2282822995ed233f3e9ea5dfb0567780d -r29b65975bb4d6a5720ef39119a9af49fafc902fa
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision fb1673d2282822995ed233f3e9ea5dfb0567780d)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 29b65975bb4d6a5720ef39119a9af49fafc902fa)
@@ -8,7 +8,7 @@
 * @file    DialInFlow.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      15-Jun-2022
+* @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.
@@ -110,6 +110,9 @@
 #define DIP_PWM_FROM_ML_PER_MIN(rate)        ( ( ( (rate) - 49.121F ) / 684.73F ) + DIP_PWM_ZERO_OFFSET )
 /// Conversion from PWM duty cycle % to commanded pump motor speed.  PWM range is 10% to 90%.  RPM range is 0 to 3200.  3200 / 0.8 = 4000.
 #define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm)      ( ((pwm) - DIP_PWM_ZERO_OFFSET) * 4000.0F )
+// Macro converts PWM to estimate flow rate needed to achieve it.
+#define DIP_ML_PER_MIN_FROM_PWM(pwm)         ( (( pwm - DIP_PWM_ZERO_OFFSET) * 684.73F ) + 49.121F )
+
 
 /// Measured dialIn flow is filtered w/ moving average.
 #define SIZE_OF_ROLLING_AVG                  10
@@ -292,7 +295,7 @@
                 targetDialInFlowRate = dirFlowRate;
                 dialInPumpDirection = dir;
                 dialInPumpControlMode = mode;
-                // Set PWM duty cycle target to an estimated initial target to ramp to based on target flow rate - then we will control to flow when ramp completed
+                // Set PWM duty cycle target to an estimated initial target to ramp to based on target flow rate - then we will control to flow when ramp completed
                 dialInPumpPWMDutyCyclePct = ( 0 == flowRate ? DIP_PWM_ZERO_OFFSET : DIP_PWM_FROM_ML_PER_MIN( (F32)flowRate ) );
 
                 switch ( dialInPumpState )
@@ -880,6 +883,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
@@ -1130,7 +1155,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 );
 
@@ -1155,7 +1180,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 )
@@ -1638,6 +1663,28 @@
     }
 
     return result;
-}
+}
 
+/*********************************************************************//**
+ * @brief
+ * The testSetDialInPumpTargetDutyCycle function sets the duty cycle of the
+ * dialysate inlet pump by calling setDialInPumpTargetFlowRate.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @param value duty cycle of the dialysate inlet pump (as a percentage).
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testSetDialInPumpTargetDutyCycle( F32 value )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        setDialInPumpTargetFlowRate( (U32)DIP_ML_PER_MIN_FROM_PWM(value), MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        result = TRUE;
+    }
+
+    return result;
+}
+
 /**@}*/