Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -r335d28f954aed9522d5cc71863cd8dc253070758 -r7d0fd5ed6b9db0479af90477e5108f6d3fa8df17 --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 335d28f954aed9522d5cc71863cd8dc253070758) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 7d0fd5ed6b9db0479af90477e5108f6d3fa8df17) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2024 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) Dara Navaei -* @date (last) 18-Aug-2022 +* @date (last) 09-Apr-2024 * * @author (original) Quang Nguyen * @date (original) 22-Oct-2020 @@ -39,7 +39,9 @@ /// Enumeration of concentrate pumps. typedef enum ConcentratePumps { + CONCENTRATEPUMPS_CP1_ACID = 0, ///< Acid concentrate pump + CONCENTRATEPUMPS_FIRST = CONCENTRATEPUMPS_CP1_ACID, ///< First concentrate pump in list CONCENTRATEPUMPS_CP2_BICARB, ///< Bicarbonate concentrate pump NUM_OF_CONCENTRATE_PUMPS ///< Number of concentrate pumps } CONCENTRATE_PUMPS_T; @@ -76,9 +78,11 @@ void setConcentratePumpTargetSpeed( CONCENTRATE_PUMPS_T pumpId, F32 targetSpeed_ml_min ); F32 getConcentratePumpTargetFlowMLPM( CONCENTRATE_PUMPS_T pumpId ); -F32 getMeasuredPumpSpeed( CONCENTRATE_PUMPS_T pumpId ); +F32 getMeasuredPumpSpeedMLPM( CONCENTRATE_PUMPS_T pumpId ); BOOL getConcPumpIsParked( CONCENTRATE_PUMPS_T pumpId ); BOOL getConcPumpParkIsFaulted( CONCENTRATE_PUMPS_T pumpId ); +BOOL handleConcentratePumpParkRequest( void ); +BOOL isConcPumpParkInProgress( CONCENTRATE_PUMPS_T pumpId ); BOOL testSetConcentratePumpDataPublishIntervalOverride( U32 value ); BOOL testResetConcentratePumpDataPublishIntervalOverride( void );