Index: firmware/App/Drivers/GLXferPump.h =================================================================== diff -u -r395522dffef1348e176564925656012f529c1910 -r4ed766fe84660297858a9af1651e93ff0c4d71f1 --- firmware/App/Drivers/GLXferPump.h (.../GLXferPump.h) (revision 395522dffef1348e176564925656012f529c1910) +++ firmware/App/Drivers/GLXferPump.h (.../GLXferPump.h) (revision 4ed766fe84660297858a9af1651e93ff0c4d71f1) @@ -33,14 +33,22 @@ // ********** public definitions ********** -#define AIR_PUMP_MOTOR_OFF 0 ///< Power level setting (PWM) for H12 air pump to turn pump off. -#define AIR_PUMP_MOTOR_MAX_PWM 60 ///< Power level setting (PWM) maximum for H12 air pump. +#define AIR_PUMP_MOTOR_OFF 0.0F ///< Power level setting (PWM) for H12 air pump to turn pump off. +#define AIR_PUMP_DUTY_CYCLE_MIN 0.0F ///< Air pump minimum duty cycle in percentage +#define AIR_PUMP_DUTY_CYCLE_MAX 100.0F ///< Air pump maximum duty cycle in percentage +#define AIR_PUMP_DUTY_CYCLE_LIMIT 24.0F ///< Air pump limit duty cycle in percentage from 1- 23 as invalid +#define AIR_PUMP_MAX_PWM 250 ///< Air pump maximum PWM, FPGA ignores 251-255 // ********** public function prototypes ********** void initGasLiqXferPumpDriver( void ); -void setAirPumpMotorPower( U08 power ); -U08 getAirPumpMotorPower( void ); +void setAirPumpMotorPower( F32 power ); +F32 getAirPumpMotorPower( void ); +U16 getAirPumpMotorRPM( void ); +// TODO:remove after testing +U16 getAirPumpMotorFPGARPM( void ); +// TODO:remove after testing +U32 getAirPumpMotorScalarPower( void ); BOOL testSetAirPump( MESSAGE_T *message );