Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r63595cea8a056174d25653dc1eb4d730edab05df -r3cdfce9c1c4fa0fd205756eb458ac5d3bffc9045
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 63595cea8a056174d25653dc1eb4d730edab05df)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 3cdfce9c1c4fa0fd205756eb458ac5d3bffc9045)
@@ -97,7 +97,7 @@
 #define SIGN_FROM_12_BIT_VALUE(v)            ( (S16)(v) - (S16)DIAL_IN_PUMP_ADC_ZERO )
 
 #define DIP_SPEED_ADC_TO_RPM_FACTOR          1.751752        ///< Conversion factor from ADC counts to RPM for dialIn pump motor (3500 RPM/1998 counts).
-#define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.000193        ///< ~52 BP motor RPM = 1% PWM duty cycle
+#define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.000238        ///< ~42 BP motor RPM = 1% PWM duty cycle
 #define DIP_CURRENT_ADC_TO_MA_FACTOR         3.002           ///< Conversion factor from ADC counts to mA for dialIn pump motor.
 
 #define DIP_REV_PER_LITER                    146.84          ///< Rotor revolutions per liter.
@@ -106,8 +106,8 @@
 #define DIP_GEAR_RATIO                       32.0            ///< DialIn pump motor to dialIn pump gear ratio.
 #define DIP_PWM_ZERO_OFFSET                  0.1             ///< 10% PWM duty cycle = zero speed.
 
-/// Macro converts flow rate to estimate PWM needed to achieve it.   // TODO - I added 1.2 gain based on empirical data
-#define DIP_PWM_FROM_ML_PER_MIN(rate)        ( (rate) * DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DIP_GEAR_RATIO * DIP_MOTOR_RPM_TO_PWM_DC_FACTOR * 1.258 + DIP_PWM_ZERO_OFFSET )
+/// Macro converts flow rate to estimate PWM needed to achieve it.
+#define DIP_PWM_FROM_ML_PER_MIN(rate)        ( (rate) * DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DIP_GEAR_RATIO * DIP_MOTOR_RPM_TO_PWM_DC_FACTOR + DIP_PWM_ZERO_OFFSET )
 /// Conversion from PWM duty cycle % to commanded pump motor speed.
 #define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm)      ( ((pwm) - DIP_PWM_ZERO_OFFSET) * 4000.0 )
 
@@ -262,54 +262,60 @@
     // Direction change while pump is running is not allowed
     if ( ( FALSE == isDialInPumpOn ) || ( 0 == flowRate ) || ( dir == dialInPumpDirectionSet ) )
     {
+        U32 dirFlowRate = ( dir == MOTOR_DIR_FORWARD ? (S32)flowRate : (S32)flowRate * -1 );
+
+        // Don't interrupt pump control unless rate or mode is changing
+        if ( ( dirFlowRate != targetDialInFlowRate ) || ( mode != dialInPumpControlMode ) )
+        {
 #ifndef NO_PUMP_FLOW_LIMITS
-        // Verify flow rate
-        if ( flowRate <= MAX_DIAL_IN_FLOW_RATE )
+            // Verify flow rate
+            if ( flowRate <= MAX_DIAL_IN_FLOW_RATE )
 #endif
-        {
-            resetDialInFlowMovingAverage();
-            targetDialInFlowRate = ( dir == MOTOR_DIR_FORWARD ? (S32)flowRate : (S32)flowRate * -1 );
-            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
-            dialInPumpPWMDutyCyclePct = DIP_PWM_FROM_ML_PER_MIN((F32)flowRate);   // ~ 8% per 100 mL/min with a 10% zero offset added in (e.g. 100 mL/min = 8+10 = 18%)
-
-            switch ( dialInPumpState )
             {
-                case DIAL_IN_PUMP_RAMPING_UP_STATE:  // See if we need to reverse direction of ramp
-                    if ( dialInPumpPWMDutyCyclePct < dialInPumpPWMDutyCyclePctSet )
-                    {
-                        dialInPumpState = DIAL_IN_PUMP_RAMPING_DOWN_STATE;
-                    }
-                    break;
-                case DIAL_IN_PUMP_RAMPING_DOWN_STATE:  // See if we need to reverse direction of ramp
-                    if ( dialInPumpPWMDutyCyclePct > dialInPumpPWMDutyCyclePctSet )
-                    {
-                        dialInPumpState = DIAL_IN_PUMP_RAMPING_UP_STATE;
-                    }
-                    break;
-                case DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE:  // Start ramp to new target in appropriate direction
-                    if ( dialInPumpPWMDutyCyclePctSet > dialInPumpPWMDutyCyclePct )
-                    {
-                        dialInPumpState = DIAL_IN_PUMP_RAMPING_DOWN_STATE;
-                    }
-                    else
-                    {
-                        dialInPumpState = DIAL_IN_PUMP_RAMPING_UP_STATE;
-                    }
-                    break;
-                default:
-                    // Ok - not all states need to be handled here
-                    break;
+                resetDialInFlowMovingAverage();
+                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
+                dialInPumpPWMDutyCyclePct = DIP_PWM_FROM_ML_PER_MIN((F32)flowRate);   // ~ 8% per 100 mL/min with a 10% zero offset added in (e.g. 100 mL/min = 8+10 = 18%)
+
+                switch ( dialInPumpState )
+                {
+                    case DIAL_IN_PUMP_RAMPING_UP_STATE:  // See if we need to reverse direction of ramp
+                        if ( dialInPumpPWMDutyCyclePct < dialInPumpPWMDutyCyclePctSet )
+                        {
+                            dialInPumpState = DIAL_IN_PUMP_RAMPING_DOWN_STATE;
+                        }
+                        break;
+                    case DIAL_IN_PUMP_RAMPING_DOWN_STATE:  // See if we need to reverse direction of ramp
+                        if ( dialInPumpPWMDutyCyclePct > dialInPumpPWMDutyCyclePctSet )
+                        {
+                            dialInPumpState = DIAL_IN_PUMP_RAMPING_UP_STATE;
+                        }
+                        break;
+                    case DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE:  // Start ramp to new target in appropriate direction
+                        if ( dialInPumpPWMDutyCyclePctSet > dialInPumpPWMDutyCyclePct )
+                        {
+                            dialInPumpState = DIAL_IN_PUMP_RAMPING_DOWN_STATE;
+                        }
+                        else
+                        {
+                            dialInPumpState = DIAL_IN_PUMP_RAMPING_UP_STATE;
+                        }
+                        break;
+                    default:
+                        // Ok - not all states need to be handled here
+                        break;
+                }
+                result = TRUE;
             }
-            result = TRUE;
-        }
 #ifndef NO_PUMP_FLOW_LIMITS
-        else  // Requested flow rate too high
-        {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_DIAL_IN_FLOW_SET_TOO_HIGH, flowRate )
-        }
-#endif
+            else  // Requested flow rate too high
+            {
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_DIAL_IN_FLOW_SET_TOO_HIGH, flowRate )
+            }
+#endif
+        }
     }
 
     return result;
@@ -614,7 +620,8 @@
 
             newPWM = runPIController( PI_CONTROLLER_ID_DIALYSATE_FLOW, tgtFlow, actFlow );
             dialInPumpPWMDutyCyclePctSet = newPWM;
-            setDialInPumpControlSignalPWM( newPWM );
+            setDialInPumpControlSignalPWM( newPWM );
+            signalDialOutControl();
         }
         dipControlTimerCounter = 0;
     }