Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r443145b68c1a39efa6ffe4f8ac624cf91ec55d69 -r661f0fb4a64ed52191776a76ea22f0d36b98a462 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 443145b68c1a39efa6ffe4f8ac624cf91ec55d69) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 661f0fb4a64ed52191776a76ea22f0d36b98a462) @@ -99,7 +99,7 @@ #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.2 + DIP_PWM_ZERO_OFFSET ) +#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 )