Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -r1538c71d0c6b97469d599befce15f068d9acf5d4 -rd3671cad1447db7ad496ad6282324ef7570c5625 --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 1538c71d0c6b97469d599befce15f068d9acf5d4) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision d3671cad1447db7ad496ad6282324ef7570c5625) @@ -35,11 +35,10 @@ /// RO pump data struct. typedef struct { - U32 setROPumpPressure; ///< RO pump pressure set target + F32 roPumpTgtPressure; ///< RO pump target pressure F32 measROFlowRate; ///< RO flow rate measurement F32 roPumpPWM; ///< RO pump pwm U32 roPumpState; ///< RO pump current state - F32 roPumpTgtPressure; ///< RO pump target pressure } RO_PUMP_DATA_T; // ********** public function prototypes ********** @@ -48,16 +47,18 @@ void execROPumpMonitor( void ); void execROPumpController( void ); -BOOL setROPumpTargetFlowRate( F32 roFlowRate ); -BOOL setROPumpTargetPWM( U32 pwm ); +BOOL setROPumpTargetFlowRate( F32 roFlowRate, F32 maxPressure ); +BOOL setROPumpTargetPWM( F32 pwm ); void signalROPumpHardStop( void ); BOOL isReverseOsmosisPumpOn( void ); SELF_TEST_STATUS_T execROPumpTest( void ); F32 getTargetROPumpFlowRate( void ); -F32 getMeasuredROFlowRate( void ); +F32 getMeasuredROFlowRate( void ); + +F32 getTargetROPumpPressure( void ); BOOL testSetROPumpDataPublishIntervalOverride( U32 value ); BOOL testResetROPumpDataPublishIntervalOverride( void );