Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -r89c8709e3b27648926fbb20f25c9a67cbeb99adc -rfd897db8177752330ad08d877e0a13620513dbdc --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 89c8709e3b27648926fbb20f25c9a67cbeb99adc) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision fd897db8177752330ad08d877e0a13620513dbdc) @@ -7,8 +7,8 @@ * * @file ConcentratePumps.h * -* @author (last) Vinayakam Mani -* @date (last) 16-Sep-2025 +* @author (last) Sameer Kalliadan Poyil +* @date (last) 15-Apr-2026 * * @author (original) Vinayakam Mani * @date (original) 19-Sep-2024 @@ -32,13 +32,13 @@ // ********** public definitions ********** // For 150 RPM, Diener pump delivers 60ml/min #define CONCENTRATE_PUMP_MAX_SPEED 200.0F ///< Maximum Diener pump speed for concentrate pump in mL/min -#define DOSING_CONCENTRATE_PUMP_SPEED 60.0F ///< Diener pump speed for acid and bicarb dosing pump speed in mL/min +#define DOSING_CONCENTRATE_PUMP_SPEED 100.0F ///< Diener pump speed for acid and bicarb dosing pump speed in mL/min #define DRAIN_BICART_PUMP_SPEED 200.0F ///< Diener pump speed for cartridge drains at maximum speed in mL/min -#define DEFAULT_ACID_VOLUME_ML 0.67F ///< Acid concentrate volume in ml. -#define DEFAULT_BICARB_VOLUME_ML 1.15F ///< Bicarb concentrate volume in ml. +#define DEFAULT_ACID_VOLUME_ML 0.666666667F ///< Acid concentrate volume in ml. +#define DEFAULT_BICARB_VOLUME_ML 1.146666667F ///< Bicarb concentrate volume in ml. -#define DOSING_CONT_VOLUME 0xFFFF ///< Volume set to 0xFFFF enables continuous delivery based on the speed set. +#define DOSING_CONT_VOLUME 0xFFFFFFFF ///< Volume set to 0xFFFFFFFF enables continuous delivery based on the speed set. #define PARK_CONC_PUMPS TRUE ///< For park parameter to requestConcentratePumpOff(). #define NO_PARK_CONC_PUMPS FALSE ///< For park parameter to requestConcentratePumpOff(). @@ -101,8 +101,8 @@ BOOL getConcPumpParkRequest( CONCENTRATE_PUMPS_T pumpId ); BOOL getConcPumpIsParked( CONCENTRATE_PUMPS_T pumpId ); BOOL getConcPumpParkIsFaulted( CONCENTRATE_PUMPS_T pumpId ); -U16 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId ); -U16 getConcPumpCurrentMeasuredRevolutionCount( CONCENTRATE_PUMPS_T pumpId ); +U32 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId ); +U32 getConcPumpCurrentMeasuredRevolutionCount( CONCENTRATE_PUMPS_T pumpId ); BOOL handleConcentratePumpParkRequest( void ); BOOL isConcPumpParkInProgress( CONCENTRATE_PUMPS_T pumpId ); BOOL isConcentratePumpDosingCompleted( CONCENTRATE_PUMPS_T pumpId );