Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -r1f1b53030a930c542646d9d88c7db0c3a945f150 -r608780a6e5449b5a9710ac07299ec028117c9f4d --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 1f1b53030a930c542646d9d88c7db0c3a945f150) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 608780a6e5449b5a9710ac07299ec028117c9f4d) @@ -7,8 +7,8 @@ * * @file ROPump.h * -* @author (last) Bill Bracken -* @date (last) 22-Aug-2022 +* @author (last) Dara Navaei +* @date (last) 26-Aug-2022 * * @author (original) Sean * @date (original) 04-Apr-2020 @@ -37,13 +37,12 @@ /// RO pump data struct. typedef struct { - F32 roPumpTgtPressure; ///< RO pump target pressure. - F32 measROFlowRate; ///< RO flow rate measurement. + F32 roPumpTgtPressurePSI; ///< RO pump target pressure. + F32 roMeasFlowRateLPM; ///< RO pump measured flow rate F32 roPumpDutyCycle; ///< RO pump duty cycle. U32 roPumpState; ///< RO pump current state. - F32 roPumpTgtFlowRateLM; ///< RO pump target flow rate in L/min + F32 roPumpTgtFlowRateLPM; ///< 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,7 +61,7 @@ BOOL isROPumpRunning( void ); F32 getTargetROPumpFlowRateLPM( void ); -F32 getTargetROPumpPressure( void ); +F32 getTargetROPumpPressurePSI( void ); F32 getROGeneratedVolumeL( void ); void resetROGenerateVolumeL( void );