Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -rf4870116c87345ee0ea062df5b30187e1e113ddc -r311c75cc5ac41b4b9ca4983df84e43af910f9be4 --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision f4870116c87345ee0ea062df5b30187e1e113ddc) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 311c75cc5ac41b4b9ca4983df84e43af910f9be4) @@ -32,8 +32,8 @@ // ********** public definitions ********** -#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_FLOWRATE_MLPM 1500 ///< Maximum target RO flow rate in mL/min. +#define MIN_RO_FLOWRATE_MLPM 0 ///< Minimum target RO flow rate in mL/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. @@ -54,12 +54,14 @@ typedef struct { U32 p12PumpState; ///< RO pump current state. - U32 p12PumpDutyCycle; ///< RO pump duty cycle. + U32 p12PumpDutyCycle; ///< RO pump duty cycle at driver level. 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 mL/min ) for control. F32 p12TargetDutyCycle; ///< RO pump target duty cycle for open loop control. + F32 p12PumpDutyCyclePct; ///< RO pump duty cycle as a percentage. + F32 p12PumpFBDutyCyclePct; ///< RO pump feedback duty cycle as a percentage. } RO_PUMP_DATA_T; // ********** public function prototypes **********