Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -r677d24e39a17598b46bb5a4656a0dd79cf6596e5 -r863f8f88c73ee5dd285242f6e131a14862b4f5c4 --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 677d24e39a17598b46bb5a4656a0dd79cf6596e5) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 863f8f88c73ee5dd285242f6e131a14862b4f5c4) @@ -32,8 +32,8 @@ // ********** public definitions ********** -#define MAX_RO_FLOWRATE_LPM 1.5F ///< Maximum target RO flow rate in L/min. -#define MIN_RO_FLOWRATE_LPM 0.0F ///< Minimum target RO flow rate in L/min. +#define MAX_RO_FLOWRATE_MLPM 1500 ///< Maximum target RO flow rate in L/min. +#define MIN_RO_FLOWRATE_MLPM 0 ///< Minimum target RO flow rate in L/min. #define MAX_RO_PRESSURE_PSI 120.0F ///< Maximum allowed pressure that the RO pump can go to. #define MIN_RO_PRESSURE_PSI 10.0F ///< Minimum allowed pressure that the RO pump can go to. @@ -45,7 +45,7 @@ U32 p12PumpFBDutyCycle; ///< RO pump feedback duty cycle. F32 p12PumpSpeed; ///< RO pump speed (RPM). F32 p12TargetPressure; ///< RO pump target pressure for control. - F32 p12TargetFlow; ///< RO pump target flow ( in L/min ) for control. + F32 p12TargetFlow; ///< RO pump target flow ( in mL/min ) for control. F32 p12TargetDutyCycle; ///< RO pump target duty cycle for open loop control. } RO_PUMP_DATA_T; @@ -58,12 +58,12 @@ void signalROPumpHardStop( void ); BOOL isROPumpRunning( void ); -BOOL setROPumpTargetFlowRateLPM( F32 roFlowRate ); +BOOL setROPumpTargetFlowRateMLPM( U32 roFlowRate ); BOOL setROPumpTargetPressure( F32 roPressure ); BOOL setROPumpTargetDutyCycle( F32 duty ); F32 getROFeedbackDutyCycle( void ); -F32 getTargetROPumpFlowRateLPM( void ); +U32 getTargetROPumpFlowRateMLPM( void ); F32 getTargetROPumpPressure( void ); BOOL testROPumpDataPublishIntervalOverride( MESSAGE_T *message );