Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -r99011bfb443632a788f3afe395c9c63a797bde9d -r1e044a958c655d09fed725cfbc9808319b642d13 --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 99011bfb443632a788f3afe395c9c63a797bde9d) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 1e044a958c655d09fed725cfbc9808319b642d13) @@ -29,29 +29,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 +#define MIN_RO_FLOWRATE 300 + // ********** 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 );