Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r2468e56fbecd26da713bc78535bd727f4b105fe1 -rbd9f7ebe27d5fbdc893d04c9925f1990e873edfa --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 2468e56fbecd26da713bc78535bd727f4b105fe1) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision bd9f7ebe27d5fbdc893d04c9925f1990e873edfa) @@ -64,14 +64,9 @@ #define FLOW_SAMPLES_TO_AVERAGE ( 250 / TASK_PRIORITY_INTERVAL ) ///< Averaging flow data over 250 ms intervals. #define FLOW_AVERAGE_MULTIPLIER ( 1.0 / (F32)FLOW_SAMPLES_TO_AVERAGE ) ///< Optimization - multiplying is faster than dividing. -#ifdef USE_SMALL_FLOW_SENSOR_K_FACTOR -// TODO new flow sensor k factor for testing only #define RO_FLOW_ADC_TO_LPM_FACTOR 300 ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading). -#else -#define RO_FLOW_ADC_TO_LPM_FACTOR 5555 ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading). -#endif -#define RO_FLOW_ADC_TO_LPM_FACTOR_TEMP_REMOVE 5555 +#define RO_FLOW_ADC_TO_LPM_FACTOR_TEMP_REMOVE 5555 //TODo remove #define ROP_FLOW_TO_PWM_SLOPE 0.1 ///< Slope of flow to PWM line equation. #define ROP_FLOW_TO_PWM_INTERCEPT 0.0 ///< Intercept of flow to PWM line equation.