Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r893b25a778d71b4d779ff14aa7361914f388e87e
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 893b25a778d71b4d779ff14aa7361914f388e87e)
@@ -83,19 +83,19 @@
 #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.751752        ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor.
-#define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR          0.000193        ///< ~52 BP motor RPM = 1% PWM duty cycle
-#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.
 #define SIGN_FROM_12_BIT_VALUE(v)               ( (S16)(v) - (S16)DOP_ADC_ZERO )   ///< Macro converts a 12-bit ADC reading to a signed 16-bit value.
 
+#define DOP_SPEED_ADC_TO_RPM_FACTOR             1.601601        ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor (3200 RPM/1998 counts).
+#define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR          0.000193        ///< ~52 BP motor RPM = 1% PWM duty cycle
+#define DOP_CURRENT_ADC_TO_MA_FACTOR            3.002           ///< Conversion factor from ADC counts to mA for dialysate outlet pump motor.
 
-/*** setDialOutFlowRxTotalVolumeAndRxTime ***/
 #define DOP_REV_PER_LITER                       144.7           ///< 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_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 )
 /// Conversion from PWM duty cycle % to commanded pump motor speed.