Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r1b6b84d8a24a19984ec4a2d89db017e7247ad46c -rd2a3a96829a14b5716764373b9c38166f8bb8e46
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 1b6b84d8a24a19984ec4a2d89db017e7247ad46c)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision d2a3a96829a14b5716764373b9c38166f8bb8e46)
@@ -57,7 +57,6 @@
 #define MAX_DIAL_OUT_PUMP_PWM_CHANGE            0.05F           ///< Maximum duty cycle change allowed.
 #define MAX_DIAL_OUT_PUMP_PWM_STEP_UP_CHANGE    0.01064F        ///< Maximum duty cycle change when ramping up.
 #define MAX_DIAL_OUT_PUMP_PWM_STEP_DN_CHANGE    0.016F          ///< Maximum duty cycle change when ramping down.
-#define MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE_SET    0.82F           ///< Max duty cycle is 82% to cap pump speed to 3,600 RPM during treatment.
 #define MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.90F           ///< Controller will error if PWM duty cycle > 90%, so set max to 90%.
 #define MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.10F           ///< Controller will error if PWM duty cycle < 10%, so set min to 10%.
 #define MIN_DIAL_OUT_CL_PWM_DUTY_CYCLE          0.11F           ///< Dial outlet pump Closed Loop minimum PWM duty cycle.
@@ -87,6 +86,7 @@
 #define DOP_MAX_MOTOR_SPEED_ERROR_RPM           300.0F          ///< Maximum difference in speed between measured and commanded RPM.
 #define DOP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT    0.15F           ///< Maximum motor speed vs target difference in percent.
 #define DOP_MIN_ROTOR_SPEED_VS_MOTOR_PCT       -0.6F            ///< Minimum rotor speed vs target difference in percent.
+#define DOP_MAX_MOTOR_SPEED_TIGHT_ROTOR_TOL     3200            ///< Maximum motor speed at which tighter rotor speed tolerance is applied.
 
 /// Persist time (task intervals) for motor off error condition.
 static const U32 DOP_OFF_ERROR_PERSIST          = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
@@ -331,7 +331,7 @@
                 dialOutPumpControlMode = 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
                 dialOutPumpPWMDutyCyclePct = pwmDC;
-                dialOutPumpPWMDutyCyclePct = RANGE( dialOutPumpPWMDutyCyclePct, MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE, MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE_SET );
+                dialOutPumpPWMDutyCyclePct = RANGE( dialOutPumpPWMDutyCyclePct, MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE, MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE );
 
                 switch ( dialOutPumpState )
                 {
@@ -870,7 +870,7 @@
             }
 
             // Limit PWM range
-            dialOutPumpPWMDutyCyclePctSet = MIN( dialOutPumpPWMDutyCyclePctSet, MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE_SET );
+            dialOutPumpPWMDutyCyclePctSet = MIN( dialOutPumpPWMDutyCyclePctSet, MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE );
             dialOutPumpPWMDutyCyclePctSet = MAX( dialOutPumpPWMDutyCyclePctSet, MIN_DIAL_OUT_CL_PWM_DUTY_CYCLE );
 
             // Apply new PWM to DPo pump
@@ -1175,6 +1175,7 @@
         F32 measMotorSpeedInRotorRPM = fabs( measMotorSpeed / DOP_GEAR_RATIO );
         F32 deltaRotorSpeed = ( measRotorSpeed - measMotorSpeedInRotorRPM );
         F32 measMotorSpeedDeltaPct = ( deltaRotorSpeed / measMotorSpeedInRotorRPM );
+        F32 rotSpdPctTol = ( cmdMotorSpeed > DOP_MAX_MOTOR_SPEED_TIGHT_ROTOR_TOL ? DOP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT : DOP_MIN_ROTOR_SPEED_VS_MOTOR_PCT );
 
         // Check measured motor speed vs. commanded motor speed while controlling to target
         if ( ( deltaMotorSpeed > DOP_MAX_MOTOR_SPEED_ERROR_RPM ) || ( deltaMCMotorSpeed > DOP_MAX_MOTOR_SPEED_ERROR_RPM ) )
@@ -1195,8 +1196,8 @@
         }
 
         // Check measured rotor speed vs. measured motor speed while controlling to target
-        if ( ( ( deltaRotorSpeed > DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM ) && ( measMotorSpeedDeltaPct > DOP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT ) ) ||
-             ( measMotorSpeedDeltaPct < DOP_MIN_ROTOR_SPEED_VS_MOTOR_PCT ) )
+        if ( ( fabs( deltaRotorSpeed ) > DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM ) &&
+             ( ( measMotorSpeedDeltaPct > DOP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT ) || ( measMotorSpeedDeltaPct < rotSpdPctTol ) ) )
         {
             if ( ++errorDialOutRotorSpeedPersistTimerCtr >= ( getPumpRotorErrorPersistTime( measMotorSpeed, DOP_GEAR_RATIO ) / TASK_PRIORITY_INTERVAL ) )
             {