Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -rbe5079c95b05c303878763b458dc0854a600317e -r359cf587f2f935ef9f40a16d17c4105efa653c1d --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision be5079c95b05c303878763b458dc0854a600317e) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 359cf587f2f935ef9f40a16d17c4105efa653c1d) @@ -33,8 +33,8 @@ #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 +#define MAX_RO_FLOWRATE_LPM 1.2 //TODO dara +#define MIN_RO_FLOWRATE_LPM 0.2 //TODO dara // ********** public function prototypes ********** @@ -44,22 +44,22 @@ BOOL setROPumpTargetPressure( U32 roPressure, PUMP_CONTROL_MODE_T mode ); //TODO remove -BOOL setROPumpTargetFlowRate( U32 roFlowRate, PUMP_CONTROL_MODE_T mode ); +BOOL setROPumpTargetFlowRate( F32 roFlowRate ); void signalROPumpHardStop( void ); BOOL isReverseOsmosisPumpOn( void ); SELF_TEST_STATUS_T execROPumpTest( void ); -DATA_GET_PROTOTYPE( U32, getTargetROPumpFlowRate ); //TODO change +DATA_GET_PROTOTYPE( F32, getTargetROPumpFlowRate ); //TODO change DATA_GET_PROTOTYPE( F32, getMeasuredROFlowRate ); BOOL testSetROPumpDataPublishIntervalOverride( U32 value ); BOOL testResetROPumpDataPublishIntervalOverride( void ); BOOL testSetTargetROPumpPressureOverride( U32 value ); //TODO remove BOOL testResetTargetROPumpPressureOverride( void ); //TODO remove -BOOL testSetTargetROPumpFlowRateOverride( U32 value ); +BOOL testSetTargetROPumpFlowRateOverride( F32 value ); BOOL testResetTargetROPumpFlowRateOverride( void ); BOOL testSetMeasuredROFlowRateOverride( F32 value );