Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -r1e22b6ff6f42ddc57ad6c17e56057ab8a3765680 --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision a9315539f527b92523b1598ff91e47db4d71dae2) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 1e22b6ff6f42ddc57ad6c17e56057ab8a3765680) @@ -8,7 +8,7 @@ * @file ROPump.h * * @author (last) Dara Navaei -* @date (last) 23-Feb-2022 +* @date (last) 31-Mar-2022 * * @author (original) Sean * @date (original) 04-Apr-2020 @@ -31,8 +31,8 @@ */ // ********** public definitions ********** -#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. +#define MAX_RO_FLOWRATE_LPM 1.8F ///< Maximum target RO flow rate in L/min. +#define MIN_RO_FLOWRATE_LPM 0.2F ///< Minimum target RO flow rate in L/min. /// RO pump data struct. typedef struct @@ -43,7 +43,7 @@ U32 roPumpState; ///< RO pump current state. F32 roPumpTgtFlowRateLM; ///< RO pump target flow rate in L/min F32 roPumpFBDutyCycle; ///< RO pump feedback duty cycle. - F32 roPumpRawFlowRateMLP; ///< RO pump raw flow rate in mL/min. + F32 roPumpMeasFlowWithConcPumps; ///< RO pump measured flow with the concentrate pumps. } RO_PUMP_DATA_T; // ********** public function prototypes ********** @@ -63,9 +63,12 @@ F32 getTargetROPumpFlowRate( void ); F32 getMeasuredROFlowRateLPM( void ); +F32 getMeasuredROFlowRateWithConcPumpsLPM( void ); F32 getTargetROPumpPressure( void ); +F32 getROGeneratedVolumeL( void ); + BOOL testSetROPumpDataPublishIntervalOverride( U32 value ); BOOL testResetROPumpDataPublishIntervalOverride( void );