Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r1efa1af5337b36f5022df5ce8cb7459352f13a8b -r1e1576d7b9653037829d1d4f834c1077a63fe3fe --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 1efa1af5337b36f5022df5ce8cb7459352f13a8b) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 1e1576d7b9653037829d1d4f834c1077a63fe3fe) @@ -107,8 +107,7 @@ #define DIP_PWM_ZERO_OFFSET 0.1F ///< 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)*(rate)) * 0.000001 ) + ( (rate) * 0.0005 ) + 0.126 + 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 + DIP_PWM_ZERO_OFFSET ) +#define DIP_PWM_FROM_ML_PER_MIN(rate) ( ( ( (rate) - 49.121F ) / 684.73F ) + DIP_PWM_ZERO_OFFSET ) /// Conversion from PWM duty cycle % to commanded pump motor speed. PWM range is 10% to 90%. RPM range is 0 to 3200. 3200 / 0.8 = 4000. #define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm) ( ((pwm) - DIP_PWM_ZERO_OFFSET) * 4000.0F )