Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -r863f8f88c73ee5dd285242f6e131a14862b4f5c4 -r8d272582cbd2cb5fc0c6af0fead2867ce02658b0 --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 863f8f88c73ee5dd285242f6e131a14862b4f5c4) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 8d272582cbd2cb5fc0c6af0fead2867ce02658b0) @@ -37,6 +37,9 @@ #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. +#define ROP_FLOW_TO_PWM(flow) ( ROP_FLOW_TO_PWM_SLOPE * flow + ROP_FLOW_TO_PWM_INTERCEPT ) ///< PWM line equation for flow. +#define ROP_PRESSURE_TO_PWM(pres) ( ROP_PRESSURE_TO_PWM_SLOPE * pres + ROP_PRESSURE_TO_PWM_INTERCEPT ) ///< PWM line equation for pressure. + /// RO pump data record. typedef struct { @@ -62,7 +65,8 @@ BOOL setROPumpTargetPressure( F32 roPressure ); BOOL setROPumpTargetDutyCycle( F32 duty ); -F32 getROFeedbackDutyCycle( void ); +F32 getCurrentROPumpDutyCyclePCT( void ); +F32 getTargetROPumpDutyCyclePCT( void ); U32 getTargetROPumpFlowRateMLPM( void ); F32 getTargetROPumpPressure( void );