Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r6fcdec8a308be986e5a64b4222918e718622a19d
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 6fcdec8a308be986e5a64b4222918e718622a19d)
@@ -48,8 +48,8 @@
 
 #define MAX_DIAL_OUT_PUMP_PWM_STEP_UP_CHANGE    0.0133          ///< Maximum duty cycle change when ramping up ~ 200 mL/min/s.
 #define MAX_DIAL_OUT_PUMP_PWM_STEP_DN_CHANGE    0.02            ///< Maximum duty cycle change when ramping down ~ 300 mL/min/s.
-#define MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.88            ///< Controller will error if PWM duty cycle > 90%, so set max to 88%.
-#define MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.12            ///< Controller will error if PWM duty cycle < 10%, so set min to 12%.
+#define MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.89            ///< Controller will error if PWM duty cycle > 90%, so set max to 89%.
+#define MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.10            ///< Controller will error if PWM duty cycle < 10%, so set min to 10%.
 
 /// Interval (ms/task time) at which the dialysate outlet pump is controlled.
 static const U32 DOP_CONTROL_INTERVAL         = ( 2000 / TASK_GENERAL_INTERVAL );
@@ -81,7 +81,13 @@
 #define DOP_MAX_CURR_WHEN_RUNNING_MA            2000.0          ///< Motor controller current should not exceed this when pump should be running.
 #define DOP_MAX_CURR_ERROR_DURATION_MS          2000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm.
 
-#define DOP_SPEED_ADC_TO_RPM_FACTOR             1.280938        ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor.
+#ifndef V2_0_SYSTEM
+    #define DOP_SPEED_ADC_TO_RPM_FACTOR         1.751752        ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor.
+    #define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR      0.00025         ///< ~40 BP motor RPM = 1% PWM duty cycle
+#else
+    #define DOP_SPEED_ADC_TO_RPM_FACTOR         1.280938        ///< Conversion factor from ADC counts to RPM for blood pump motor
+    #define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR      0.0003125       ///< ~32 BP motor RPM = 1% PWM duty cycle
+#endif
 #define DOP_CURRENT_ADC_TO_MA_FACTOR            3.002           ///< Conversion factor from ADC counts to mA for dialysate outlet pump motor.
 #define DOP_ADC_FULL_SCALE_V                    3.0             ///< DPo analog signals are 0-3V (while int. ADC ref V may be different).
 #define DOP_ADC_ZERO                            1998            ///< Mid-point (zero) for ADC readings.
@@ -92,7 +98,6 @@
 #define DOP_REV_PER_LITER                       150.0           ///< Rotor revolutions per liter.
 #define DOP_ML_PER_MIN_TO_PUMP_RPM_FACTOR       ( DOP_REV_PER_LITER / ML_PER_LITER )   ///< Conversion factor from mL/min to pump motor RPM.
 #define DOP_GEAR_RATIO                          32.0            ///< Pump motor to pump gear ratio.
-#define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR          0.00028         ///< ~28 DPo motor RPM = 1% PWM duty cycle.
 #define DOP_PWM_ZERO_OFFSET                     0.1             ///< 10% PWM duty cycle = zero speed.
 /// Macro converts a flow rate to an estimated PWM duty cycle %.
 #define DOP_PWM_FROM_ML_PER_MIN(rate)           ( (rate) * DOP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DOP_GEAR_RATIO * DOP_MOTOR_RPM_TO_PWM_DC_FACTOR + DOP_PWM_ZERO_OFFSET )