Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rf7cdfd3256f195cd8aa06e28009cd5f26b50f08c -rdb6f405ef30befc5acc2c8d70665fd04b1c3cfe6
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision f7cdfd3256f195cd8aa06e28009cd5f26b50f08c)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision db6f405ef30befc5acc2c8d70665fd04b1c3cfe6)
@@ -90,7 +90,13 @@
 #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.751752        ///< Conversion factor from ADC counts to RPM for dialIn pump motor.
+#define DIAL_IN_PUMP_ADC_FULL_SCALE_V        3.0             ///< BP analog signals are 0-3V (while int. ADC ref V may be different).
+#define DIAL_IN_PUMP_ADC_ZERO                1998            ///< Mid-point (zero) for ADC readings.
+
+///< Macro converts a 12-bit ADC reading to a signed 16-bit value.
+#define SIGN_FROM_12_BIT_VALUE(v)            ( (S16)(v) - (S16)DIAL_IN_PUMP_ADC_ZERO )
+
+#define DIP_SPEED_ADC_TO_RPM_FACTOR          1.601601        ///< Conversion factor from ADC counts to RPM for dialIn pump motor (3200 RPM/1998 counts).
 #define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.000193        ///< ~52 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.
 
@@ -99,16 +105,12 @@
 #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_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 )
 /// 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 )
 
-#define DIAL_IN_PUMP_ADC_FULL_SCALE_V        3.0             ///< BP analog signals are 0-3V (while int. ADC ref V may be different).
-#define DIAL_IN_PUMP_ADC_ZERO                1998            ///< Mid-point (zero) for ADC readings.
-///< Macro converts a 12-bit ADC reading to a signed 16-bit value.
-#define SIGN_FROM_12_BIT_VALUE(v)            ( (S16)(v) - (S16)DIAL_IN_PUMP_ADC_ZERO )
-
 /// Measured dialIn flow is filtered w/ moving average.
 #define SIZE_OF_ROLLING_AVG                  10