Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rfa0ab419491364c1d2a28caf216e20175181372d -r6fcdec8a308be986e5a64b4222918e718622a19d
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision fa0ab419491364c1d2a28caf216e20175181372d)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 6fcdec8a308be986e5a64b4222918e718622a19d)
@@ -46,8 +46,8 @@
 
 #define MAX_DIAL_IN_PUMP_PWM_STEP_UP_CHANGE   0.0133          ///< Max duty cycle change when ramping up ~ 200 mL/min/s.
 #define MAX_DIAL_IN_PUMP_PWM_STEP_DN_CHANGE   0.02            ///< Max duty cycle change when ramping down ~ 300 mL/min/s.
-#define MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE       0.88            ///< Controller will error if PWM duty cycle > 90%, so set max to 88%.
-#define MIN_DIAL_IN_PUMP_PWM_DUTY_CYCLE       0.12            ///< Controller will error if PWM duty cycle < 10%, so set min to 12%.
+#define MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE       0.89            ///< Controller will error if PWM duty cycle > 90%, so set max to 89%.
+#define MIN_DIAL_IN_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 dialIn pump is controlled.
 static const U32 DIP_CONTROL_INTERVAL      = ( 10000 / TASK_GENERAL_INTERVAL );
@@ -83,14 +83,19 @@
 #define DIP_MAX_CURR_WHEN_RUNNING_MA         2000.0          ///< Motor controller current should not exceed this when pump should be running.
 #define DIP_MAX_CURR_ERROR_DURATION_MS       2000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm.
 
-#define DIP_SPEED_ADC_TO_RPM_FACTOR          1.280938        ///< Conversion factor from ADC counts to RPM for dialIn pump motor.
+#ifndef V2_0_SYSTEM
+    #define DIP_SPEED_ADC_TO_RPM_FACTOR          1.751752    ///< Conversion factor from ADC counts to RPM for dialIn pump motor.
+    #define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.00025     ///< ~40 BP motor RPM = 1% PWM duty cycle
+#else
+    #define DIP_SPEED_ADC_TO_RPM_FACTOR          1.280938    ///< Conversion factor from ADC counts to RPM for blood pump motor
+    #define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.0003125   ///< ~32 BP motor RPM = 1% PWM duty cycle
+#endif
 #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                    150.0           ///< Rotor revolutions per liter.
 /// Macro converts flow rate to motor RPM.
 #define DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR    ( DIP_REV_PER_LITER / ML_PER_LITER )
 #define DIP_GEAR_RATIO                       32.0            ///< DialIn pump motor to dialIn pump gear ratio.
-#define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.00028         ///< ~28 BP motor RPM = 1% PWM duty cycle.
 #define DIP_PWM_ZERO_OFFSET                  0.1             ///< 10% PWM duty cycle = zero speed.
 /// 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 )