Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r1644c24b0b51661ceaba579e5ebee0d1d5bad85f -r09583a9e0a51bb47dd04c825cd706f5a3774bded --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 1644c24b0b51661ceaba579e5ebee0d1d5bad85f) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 09583a9e0a51bb47dd04c825cd706f5a3774bded) @@ -69,7 +69,9 @@ /// Volume output per pulse. #define CONCENTRATE_PUMP_VOLUME_PER_PULSE ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_PULSE_PER_REV ) -#define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL ( 1000 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the concentrate pump is monitored. +//Testing +#define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL ( 50 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the concentrate pump is monitored. +//#define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL ( 1000 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the concentrate pump is monitored. #define CONCENTRATE_PUMP_CONTROL_INTERVAL ( 100 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the concentrate pump is controlled. #define CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS ( 10 * MS_PER_SECOND ) ///< Concentrate pumps speed out of range timeout in milliseconds. @@ -155,7 +157,7 @@ //static DD_ACID_CONCENTRATES_RECORD_T acidConcentrateCalRecord; ///< Acid concentrate calibration record. //static DD_BICARB_CONCENTRATES_RECORD_T bicarbConcentrateCalRecord; ///< Bicarb concentrate calibration record. -//static DD_UF_PUMP_RECORD_T ultrafilterationPumpCalRecord; ///< Ultrafilteration pump calibration record. +//static DD_UF_PUMP_RECORD_T ultrafiltrationPumpCalRecord; ///< Ultrafiltration pump calibration record. //static DD_CONC_PUMPS_CAL_RECORD_T concentratePumpsCalRecord; ///< Concentrate pumps calibration record. // ********** private function prototypes ********** @@ -533,7 +535,14 @@ if ( targetVolume_ml > 0.0 ) { #ifndef __PUMPTEST__ - pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION ); + if ( DOSING_CONT_VOLUME == targetVolume_ml ) + { + pumpTargetRevCnt[ pumpId ].data = DOSING_CONT_VOLUME; + } + else + { + pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION ); + } #else pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * PISTON_PUMP_VOLUME_TO_REVOLUTION ); #endif