Index: firmware/App/Controllers/BoostPump.h =================================================================== diff -u -r319d8e8f56e60bec2c38c79e1de0acc4841551a9 -r863f8f88c73ee5dd285242f6e131a14862b4f5c4 --- firmware/App/Controllers/BoostPump.h (.../BoostPump.h) (revision 319d8e8f56e60bec2c38c79e1de0acc4841551a9) +++ firmware/App/Controllers/BoostPump.h (.../BoostPump.h) (revision 863f8f88c73ee5dd285242f6e131a14862b4f5c4) @@ -32,10 +32,10 @@ // ********** public definitions ********** -#define MAX_BOOST_FLOWRATE_LPM 1.5F ///< Maximum target Boost flow rate in L/min. -#define MIN_BOOST_FLOWRATE_LPM 0.0F ///< Minimum target Boost flow rate in L/min. -#define MAX_BOOST_PRESSURE_PSI 40.0F ///< Maximum allowed pressure that the Boost pump can go to. -#define MIN_BOOST_PRESSURE_PSI 10.0F ///< Minimum allowed pressure that the Boost pump can go to. +#define MAX_BOOST_FLOWRATE_MLPM 1500 ///< Maximum target Boost flow rate in mL/min. +#define MIN_BOOST_FLOWRATE_MLPM 0 ///< Minimum target Boost flow rate in mL/min. +#define MAX_BOOST_PRESSURE_PSI 40.0F ///< Maximum allowed pressure that the Boost pump can go to. +#define MIN_BOOST_PRESSURE_PSI 10.0F ///< Minimum allowed pressure that the Boost pump can go to. /// Boost pump data record. typedef struct @@ -45,7 +45,7 @@ U32 p40PumpFBDutyCycle; ///< Boost pump feedback duty cycle. F32 p40PumpSpeed; ///< Boost pump speed (RPM). F32 p40TargetPressure; ///< Boost pump target pressure for control. - F32 p40TargetFlow; ///< Boost pump target flow ( in L/min ) for control. + F32 p40TargetFlow; ///< Boost pump target flow ( in mL/min ) for control. F32 p40TargetDutyCycle; ///< Boost pump target duty cycle for open loop control. } BOOST_PUMP_DATA_T; @@ -58,12 +58,12 @@ void signalBoostPumpStop( void ); BOOL isBoostPumpRunning( void ); -BOOL setBoostPumpTargetFlowRateLPM( F32 roFlowRate ); +BOOL setBoostPumpTargetFlowRateLPM( U32 roFlowRate ); BOOL setBoostPumpTargetPressure( F32 roPressure ); BOOL setBoostPumpTargetDutyCycle( F32 duty ); F32 getBoostFeedbackDutyCycle( void ); -F32 getTargetBoostPumpFlowRateLPM( void ); +U32 getTargetBoostPumpFlowRateMLPM( void ); F32 getTargetBoostPumpPressure( void ); BOOL testBoostPumpDataPublishIntervalOverride( MESSAGE_T *message );