Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -rbe5079c95b05c303878763b458dc0854a600317e --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision a7bf3ca23ea37a61000379facae628a31b3ecc59) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision be5079c95b05c303878763b458dc0854a600317e) @@ -30,29 +30,38 @@ // ********** public definitions ********** -#define MAX_RO_PRESSURE 140 ///< Maximum target RO outlet pressure (in PSI). -#define MIN_RO_PRESSURE 100 ///< Minimum target RO outlet pressure (in PSI). +#define MAX_RO_PRESSURE 140 ///< Maximum target RO outlet pressure (in PSI). //TODO remove +#define MIN_RO_PRESSURE 100 ///< Minimum target RO outlet pressure (in PSI). //TODO remove +#define MAX_RO_FLOWRATE 2000 //TODO dara +#define MIN_RO_FLOWRATE 300 //TODO dara + // ********** public function prototypes ********** void initROPump( void ); void execROPumpMonitor( void ); void execROPumpController( void ); -BOOL setROPumpTargetPressure( U32 roPressure, PUMP_CONTROL_MODE_T mode ); +BOOL setROPumpTargetPressure( U32 roPressure, PUMP_CONTROL_MODE_T mode ); //TODO remove + +BOOL setROPumpTargetFlowRate( U32 roFlowRate, PUMP_CONTROL_MODE_T mode ); void signalROPumpHardStop( void ); BOOL isReverseOsmosisPumpOn( void ); SELF_TEST_STATUS_T execROPumpTest( void ); -DATA_GET_PROTOTYPE( U32, getTargetROPumpPressure ); +DATA_GET_PROTOTYPE( U32, getTargetROPumpFlowRate ); //TODO change DATA_GET_PROTOTYPE( F32, getMeasuredROFlowRate ); BOOL testSetROPumpDataPublishIntervalOverride( U32 value ); BOOL testResetROPumpDataPublishIntervalOverride( void ); -BOOL testSetTargetROPumpPressureOverride( U32 value ); -BOOL testResetTargetROPumpPressureOverride( void ); +BOOL testSetTargetROPumpPressureOverride( U32 value ); //TODO remove +BOOL testResetTargetROPumpPressureOverride( void ); //TODO remove + +BOOL testSetTargetROPumpFlowRateOverride( U32 value ); +BOOL testResetTargetROPumpFlowRateOverride( void ); + BOOL testSetMeasuredROFlowRateOverride( F32 value ); BOOL testResetMeasuredROFlowRateOverride( void );