Index: firmware/App/Controllers/DrainPump.h =================================================================== diff -u -r1f500f8e6159a3fbab85ea68389e918a6df66400 -r58129c9bb3053c39efa07f60e975f17e2a04755a --- firmware/App/Controllers/DrainPump.h (.../DrainPump.h) (revision 1f500f8e6159a3fbab85ea68389e918a6df66400) +++ firmware/App/Controllers/DrainPump.h (.../DrainPump.h) (revision 58129c9bb3053c39efa07f60e975f17e2a04755a) @@ -36,9 +36,10 @@ /// Drain pump data publish typedef struct { - U32 speedSetPoint; ///< Drain pump speed set point (for open loop) + U32 rpmSetPoint; ///< Drain pump speed set point (for open loop) U32 pumpDACSet; ///< Drain pump DAC set value U32 drainPumpState; ///< Drain pump state machine state + U32 drainPumpRPM; ///< Drain pump current RPM } DRAIN_PUMP_DATA_T; // ********** public function prototypes ********** @@ -47,23 +48,23 @@ void execDrainPumpMonitor( void ); void execDrainPumpController( void ); -BOOL setDrainPumpTargetSpeed( U32 rpm ); +BOOL setDrainPumpTargetRPM( U32 rpm ); BOOL setDrainPumpTargetDeltaPressure( F32 deltaP ); void signalDrainPumpHardStop( void ); SELF_TEST_STATUS_T execDrainPumpTest( void ); -U32 getTargetDrainPumpSpeed( void ); +U32 getTargetDrainPumpRPM( void ); F32 getTargetDrainPumpDeltaP( void ); BOOL testSetDrainPumpDataPublishIntervalOverride( U32 value ); BOOL testResetDrainPumpDataPublishIntervalOverride( void ); -BOOL testSetTargetDrainPumpSpeedOverride( U32 value ); -BOOL testResetTargetDrainPumpSpeedOverride( void ); +BOOL testSetTargetDrainPumpRPMOverride( U32 value ); +BOOL testResetTargetDrainPumpRPMOverride( void ); BOOL testSetTargetDrainPumpDeltaPressureOverride( F32 value ); BOOL testResetTargetDrainPumpDeltaPressureOverride( void );