Index: firmware/App/Controllers/AirPump.c =================================================================== diff -u -rf08afb101ec9f209412551c485e7b2faed0aa900 -rf049791a4d8b29118e1eb29e351fdca6a1908ffa --- firmware/App/Controllers/AirPump.c (.../AirPump.c) (revision f08afb101ec9f209412551c485e7b2faed0aa900) +++ firmware/App/Controllers/AirPump.c (.../AirPump.c) (revision f049791a4d8b29118e1eb29e351fdca6a1908ffa) @@ -22,7 +22,7 @@ #include "PersistentAlarm.h" #include "TaskGeneral.h" #include "Timers.h" -#include "FpgaTD.h" +#include "GLXferPump.h" /** * @addtogroup AirPump @@ -150,7 +150,6 @@ break; } - currentAirPumpRPM = getAirPumpRPM(); publishAirPumpData(); } Index: firmware/App/Drivers/GLXferPump.c =================================================================== diff -u -r395522dffef1348e176564925656012f529c1910 -rf049791a4d8b29118e1eb29e351fdca6a1908ffa --- firmware/App/Drivers/GLXferPump.c (.../GLXferPump.c) (revision 395522dffef1348e176564925656012f529c1910) +++ firmware/App/Drivers/GLXferPump.c (.../GLXferPump.c) (revision f049791a4d8b29118e1eb29e351fdca6a1908ffa) @@ -85,7 +85,19 @@ return currentAirPumpMotorPowerLevel; } +/*********************************************************************//** +* @brief +* The getAirPumpMotorRPM function reads the air pump RPM from FPGA. +* @details \b Inputs: none +* @details \b Outputs: none +* @return air pump motor RPM value. +*************************************************************************/ +U16 getAirPumpMotorRPM( void ) +{ + return getAirPumpRPM(); +} + /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ Index: firmware/App/Drivers/GLXferPump.h =================================================================== diff -u -r395522dffef1348e176564925656012f529c1910 -rf049791a4d8b29118e1eb29e351fdca6a1908ffa --- firmware/App/Drivers/GLXferPump.h (.../GLXferPump.h) (revision 395522dffef1348e176564925656012f529c1910) +++ firmware/App/Drivers/GLXferPump.h (.../GLXferPump.h) (revision f049791a4d8b29118e1eb29e351fdca6a1908ffa) @@ -41,6 +41,7 @@ void initGasLiqXferPumpDriver( void ); void setAirPumpMotorPower( U08 power ); U08 getAirPumpMotorPower( void ); +U16 getAirPumpMotorRPM( void ); BOOL testSetAirPump( MESSAGE_T *message );