Index: firmware/App/Controllers/BoostPump.h =================================================================== diff -u -r410afd26b3ae5e372310c696c82f58c59235e10d -r8d272582cbd2cb5fc0c6af0fead2867ce02658b0 --- firmware/App/Controllers/BoostPump.h (.../BoostPump.h) (revision 410afd26b3ae5e372310c696c82f58c59235e10d) +++ firmware/App/Controllers/BoostPump.h (.../BoostPump.h) (revision 8d272582cbd2cb5fc0c6af0fead2867ce02658b0) @@ -37,6 +37,9 @@ #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 BOOST_FLOW_TO_PWM(flow) ( BOOST_FLOW_TO_PWM_SLOPE * flow + BOOST_FLOW_TO_PWM_INTERCEPT ) ///< PWM line equation for flow. +#define BOOST_PRESSURE_TO_PWM(pres) ( BOOST_PRESSURE_TO_PWM_SLOPE * pres + BOOST_PRESSURE_TO_PWM_INTERCEPT ) ///< PWM line equation for pressure. + /// Boost pump data record. typedef struct { @@ -62,7 +65,8 @@ BOOL setBoostPumpTargetPressure( F32 roPressure ); BOOL setBoostPumpTargetDutyCycle( F32 duty ); -F32 getBoostFeedbackDutyCycle( void ); +F32 getCurrentBoostPumpDutyCyclePCT( void ); +F32 getTargetBoostPumpDutyCyclePCT( void ); U32 getTargetBoostPumpFlowRateMLPM( void ); F32 getTargetBoostPumpPressure( void );