Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -r0a74bcce6674271e35d5154003dd6c25011f80f9 -rd73fcb6d9e2a48f0f89cfcbfd6609c029f702839 --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 0a74bcce6674271e35d5154003dd6c25011f80f9) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision d73fcb6d9e2a48f0f89cfcbfd6609c029f702839) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2026 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file ConcentratePumps.h * -* @author (last) Vinayakam Mani -* @date (last) 19-Sep-2024 +* @author (last) Sameer Kalliadan Poyil +* @date (last) 03-Feb-2026 * * @author (original) Vinayakam Mani * @date (original) 19-Sep-2024 @@ -30,16 +30,15 @@ */ // ********** public definitions ********** -#ifdef __DIENER_CONC_PUMP__ // For 150 RPM, Diener pump delivers 60ml/min -#define CONCENTRATE_PUMP_MAX_SPEED 60.0F ///< Optimal speed for concentrate pump in mL/min -#else -#define CONCENTRATE_PUMP_MAX_SPEED 48.0F ///< Maximum speed for concentrate pump in mL/min -#endif +#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 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 DOSING_CONT_VOLUME 0xFFFF ///< Volume set to 0xFFFF enables contineous 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(). @@ -50,7 +49,7 @@ D11_PUMP = 0, ///< Acid concentrate pump CONCENTRATEPUMPS_FIRST = D11_PUMP, ///< First concentrate pump in list D10_PUMP, ///< Bicarbonate concentrate pump - D76_PUMP, ///< Ultrafilteration pump + D76_PUMP, ///< ultrafiltration pump NUM_OF_CONCENTRATE_PUMPS ///< Number of concentrate pumps } CONCENTRATE_PUMPS_T; @@ -102,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 );