Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -rd7e01dce5b2ebb1ea02832a9ced81550a919b67b
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision d7e01dce5b2ebb1ea02832a9ced81550a919b67b)
@@ -290,7 +290,7 @@
                 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%)
+                dialInPumpPWMDutyCyclePct = ( 0 == flowRate ? DIP_PWM_ZERO_OFFSET : DIP_PWM_FROM_ML_PER_MIN( (F32)flowRate ) );
 
                 switch ( dialInPumpState )
                 {
@@ -299,13 +299,15 @@
                         {
                             dialInPumpState = DIAL_IN_PUMP_RAMPING_DOWN_STATE;
                         }
-                        break;
+                        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;
+                        break;
+
                     case DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE:  // Start ramp to new target in appropriate direction
                         if ( dialInPumpPWMDutyCyclePctSet > dialInPumpPWMDutyCyclePct )
                         {
@@ -315,7 +317,8 @@
                         {
                             dialInPumpState = DIAL_IN_PUMP_RAMPING_UP_STATE;
                         }
-                        break;
+                        break;
+
                     default:
                         // Ok - not all states need to be handled here
                         break;
@@ -658,8 +661,8 @@
             newPWM = runPIController( PI_CONTROLLER_ID_DIALYSATE_FLOW, tgtFlow, actFlow );
             dialInPumpPWMDutyCyclePctSet = newPWM;
             setDialInPumpControlSignalPWM( newPWM );
-            signalDialOutControl();
         }
+        signalDialOutControl();
         dipControlTimerCounter = 0;
     }
 
@@ -1385,7 +1388,14 @@
         }
         if ( ctrlMode < NUM_OF_PUMP_CONTROL_MODES )
         {
-            result = setDialInPumpTargetFlowRate( abs(value), dir, (PUMP_CONTROL_MODE_T)ctrlMode );
+            if ( 0 == value )
+            {
+                signalDialInPumpHardStop();
+            }
+            else
+            {
+                result = setDialInPumpTargetFlowRate( abs(value), dir, (PUMP_CONTROL_MODE_T)ctrlMode );
+            }
         }
     }