Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -rdfece12385652318f19c2aa3bd0a5992b0396bec -r02fa169f02dd5a8caf27d1ea4441c74ba38317e8 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision dfece12385652318f19c2aa3bd0a5992b0396bec) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 02fa169f02dd5a8caf27d1ea4441c74ba38317e8) @@ -93,7 +93,7 @@ #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. -#define DIP_REV_PER_LITER 144.7 ///< Rotor revolutions per liter. +#define DIP_REV_PER_LITER 146.84 ///< 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. @@ -1022,7 +1022,6 @@ *************************************************************************/ static void filterDialInFlowReadings( F32 flow ) { -#ifndef RAW_FLOW_SENSOR_DATA if ( flowReadingsCount >= SIZE_OF_ROLLING_AVG ) { flowReadingsTotal -= flowReadings[ flowReadingsIdx ]; @@ -1032,9 +1031,6 @@ flowReadingsIdx = INC_WRAP( flowReadingsIdx, 0, SIZE_OF_ROLLING_AVG - 1 ); flowReadingsCount = INC_CAP( flowReadingsCount, SIZE_OF_ROLLING_AVG ); measuredDialInFlowRate.data = flowReadingsTotal / (F32)flowReadingsCount; -#else - measuredDialInFlowRate.data = flow; -#endif } /*********************************************************************//**