Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -r62a4d7b976107f7ac4d5013ce06f38f4a0bf65bd -r58129c9bb3053c39efa07f60e975f17e2a04755a --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 62a4d7b976107f7ac4d5013ce06f38f4a0bf65bd) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 58129c9bb3053c39efa07f60e975f17e2a04755a) @@ -22,22 +22,24 @@ /** * @defgroup ROPump ROPump - * @brief RO Pump monitor and controller module. Controls and monitors the RO pump. + * @brief RO Pump monitor and controller module. Controls and monitors the RO pump and the flow meter. + * The flow meter is manufactured by SwissFlow, PN: 82015311. + * The diaphragm (RO) pump is manufactured by Aquatec, PN: 5889-2MM1-V724DY. * * @addtogroup ROPump * @{ */ // ********** public definitions ********** -#define MAX_RO_FLOWRATE_LPM 1.2 ///< Maximum target RO flow rate (in LPM) -#define MIN_RO_FLOWRATE_LPM 0.2 ///< Minimum target RO flow rate (in LPM) +#define MAX_RO_FLOWRATE_LPM 1.0 ///< Maximum target RO flow rate in L/min. +#define MIN_RO_FLOWRATE_LPM 0.2 ///< Minimum target RO flow rate in L/min. /// RO pump data struct. typedef struct { F32 roPumpTgtPressure; ///< RO pump target pressure F32 measROFlowRate; ///< RO flow rate measurement - F32 roPumpDutyCycle; ///< RO pump pwm + F32 roPumpDutyCycle; ///< RO pump duty cycle U32 roPumpState; ///< RO pump current state } RO_PUMP_DATA_T; @@ -61,14 +63,16 @@ F32 getTargetROPumpPressure( void ); BOOL testSetROPumpDataPublishIntervalOverride( U32 value ); -BOOL testResetROPumpDataPublishIntervalOverride( void ); - -BOOL testSetTargetROPumpFlowRateOverride( F32 value ); -BOOL testResetTargetROPumpFlowRateOverride( void ); +BOOL testResetROPumpDataPublishIntervalOverride( void ); BOOL testSetMeasuredROFlowRateOverride( F32 value ); BOOL testResetMeasuredROFlowRateOverride( void ); +// These are not sensors, but since the functions are private, +// they can only be set from Dialin +BOOL testSetTargetROPumpFlowAndPressure( F32 flow, F32 pressure ); +BOOL testResetTargetROPumpFlowRateOverride( void ); //TODO remove? + BOOL testSetTargetROPumpPressureOverride( U32 value ); BOOL testResetTargetROPumpPressureOverride( void );