Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r550a5df210ac26217412e5e312d0a08864c5682e -rb386feef224569dbb155bfa84849e4d540f3803b --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 550a5df210ac26217412e5e312d0a08864c5682e) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision b386feef224569dbb155bfa84849e4d540f3803b) @@ -55,7 +55,9 @@ #define CONCENTRATE_PUMP_VOLUME_PER_PULSE ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_PULSE_PER_REV ) #define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL ( 500 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the concentrate pump is monitored. + #define CONCENTRATE_PUMP_CONTROL_INTERVAL ( 50 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the concentrate pump is controlled. + #define CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD ( 5 * MS_PER_SECOND ) ///< Persistence period for concentrate pump speed control error. #define NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK 1 ///< Number of acid and bicarb non-volatile data to check. Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r550a5df210ac26217412e5e312d0a08864c5682e -rb386feef224569dbb155bfa84849e4d540f3803b --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 550a5df210ac26217412e5e312d0a08864c5682e) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision b386feef224569dbb155bfa84849e4d540f3803b) @@ -369,12 +369,11 @@ measuredROFlowRateLPM.data = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER ); - // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that - // the flow is 0. - if ( FLOW_SENSOR_ZERO_READING == roFlowReading ) - { - measuredROFlowRateLPM.data = 0.0; - } + // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that the flow is 0. + if ( FLOW_SENSOR_ZERO_READING == roFlowReading ) + { + measuredROFlowRateLPM.data = 0.0; + } measuredFlowReadingsSum = 0; flowFilterCounter = 0;