Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -r025612ad77fe630889a364586de54bffe5262d56 -rc7ed4f90b600fe684097654f150e4972646ffec9 --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 025612ad77fe630889a364586de54bffe5262d56) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision c7ed4f90b600fe684097654f150e4972646ffec9) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2022 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 ROPump.h * * @author (last) Dara Navaei -* @date (last) 10-Dec-2021 +* @date (last) 23-Feb-2022 * * @author (original) Sean * @date (original) 04-Apr-2020 @@ -31,7 +31,7 @@ */ // ********** public definitions ********** -#define MAX_RO_FLOWRATE_LPM 1.4 ///< Maximum target RO flow rate in L/min. +#define MAX_RO_FLOWRATE_LPM 1.8 ///< Maximum target RO flow rate in L/min. #define MIN_RO_FLOWRATE_LPM 0.2 ///< Minimum target RO flow rate in L/min. /// RO pump data struct. @@ -41,8 +41,9 @@ F32 measROFlowRate; ///< RO flow rate measurement. F32 roPumpDutyCycle; ///< RO pump duty cycle. U32 roPumpState; ///< RO pump current state. - F32 roPumpTgtFlowRate; ///< RO pump target flow rate. + F32 roPumpTgtFlowRateLM; ///< RO pump target flow rate in L/min F32 roPumpFBDutyCycle; ///< RO pump feedback duty cycle. + F32 roPumpMeasFlowWithConcPumps; ///< RO pump measured flow with the concentrate pumps. } RO_PUMP_DATA_T; // ********** public function prototypes ********** @@ -62,6 +63,7 @@ F32 getTargetROPumpFlowRate( void ); F32 getMeasuredROFlowRateLPM( void ); +F32 getMeasuredROFlowRateWithConcPumpsLPM( void ); F32 getTargetROPumpPressure( void );