Index: firmware/App/Controllers/DrainPump.h =================================================================== diff -u -raa36ab1ed13d099286cedcbd066f7dce11146d13 -r1f500f8e6159a3fbab85ea68389e918a6df66400 --- firmware/App/Controllers/DrainPump.h (.../DrainPump.h) (revision aa36ab1ed13d099286cedcbd066f7dce11146d13) +++ firmware/App/Controllers/DrainPump.h (.../DrainPump.h) (revision 1f500f8e6159a3fbab85ea68389e918a6df66400) @@ -22,7 +22,7 @@ /** * @defgroup DrainPump DrainPump - * @brief Drain Pump monitor/controller module. Controls and monitors the drain pump. + * @brief Drain Pump monitor/controller module. Controls and monitors the drain pump. * * @addtogroup DrainPump * @{ @@ -31,7 +31,15 @@ // ********** public definitions ********** #define MIN_DRAIN_PUMP_RPM 300 ///< Minimum RPM target for drain pump (though zero is allowed if turning pump off). -#define MAX_DRAIN_PUMP_RPM 3000 ///< Maximum RPM target for drain pump. +#define MAX_DRAIN_PUMP_RPM 3000 ///< Maximum RPM target for drain pump. + +/// Drain pump data publish +typedef struct +{ + U32 speedSetPoint; ///< Drain pump speed set point (for open loop) + U32 pumpDACSet; ///< Drain pump DAC set value + U32 drainPumpState; ///< Drain pump state machine state +} DRAIN_PUMP_DATA_T; // ********** public function prototypes ********** @@ -47,7 +55,9 @@ SELF_TEST_STATUS_T execDrainPumpTest( void ); -U32 getTargetDrainPumpSpeed( void ); +U32 getTargetDrainPumpSpeed( void ); + +F32 getTargetDrainPumpDeltaP( void ); BOOL testSetDrainPumpDataPublishIntervalOverride( U32 value ); BOOL testResetDrainPumpDataPublishIntervalOverride( void );