Index: firmware/App/Services/FpgaRO.h =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r051cd0430ef8342bd606115c98871e26dc24acf1 --- firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) @@ -18,7 +18,7 @@ #ifndef __FPGA_RO_H__ #define __FPGA_RO_H__ -#include "ROCommon.h" +#include "FPCommon.h" #include "FPGA.h" /** @@ -55,33 +55,43 @@ S16 getFPGAM1RawPressure( void ); S16 getFPGAM1RawTemperature( void ); U08 getFPGAM1ReadCount( void ); -U08 getFPGAM1ErrorCount( void ); S16 getFPGAM3RawPressure( void ); S16 getFPGAM3RawTemperature( void ); U08 getFPGAM3ReadCount( void ); -U08 getFPGAM3ErrorCount( void ); S16 getFPGAP8RawPressure( void ); S16 getFPGAP8RawTemperature( void ); U08 getFPGAP8ReadCount( void ); -U08 getFPGAP8ErrorCount( void ); S16 getFPGAP13RawPressure( void ); S16 getFPGAP13RawTemperature( void ); U08 getFPGAP13ReadCount( void ); -U08 getFPGAP13ErrorCount( void ); S16 getFPGAP17RawPressure( void ); S16 getFPGAP17RawTemperature( void ); U08 getFPGAP17ReadCount( void ); -U08 getFPGAP17ErrorCount( void ); S16 getFPGAX1RawPressure( void ); S16 getFPGAX1RawTemperature( void ); U08 getFPGAX1ReadCount( void ); -U08 getFPGAX1ErrorCount( void ); +S16 getFPGAX2RawPressure( void ); +S16 getFPGAX2RawTemperature( void ); +U08 getFPGAX2ReadCount( void ); + +S16 getFPGAX3RawPressure( void ); +S16 getFPGAX3RawTemperature( void ); +U08 getFPGAX3ReadCount( void ); + +S16 getFPGAX4RawPressure( void ); +S16 getFPGAX4RawTemperature( void ); +U08 getFPGAX4ReadCount( void ); + +S16 getFPGAX5RawPressure( void ); +S16 getFPGAX5RawTemperature( void ); +U08 getFPGAX5ReadCount( void ); + U32 getFPGAP23Temperature( void ); U32 getFPGAP22Temperature( void ); @@ -129,6 +139,11 @@ U16 getFPGAP18Temperature( void ); U32 getFPGAP18Data( void ); +void setFPGAP40PumpEnable( BOOL enable ); +void setFPGAP40PumpPWM( U16 pwm ); +U16 getFPGAP40PumpPWM( void ); +U16 getFPGAP40PumpTachCount( void ); + /**@}*/ #endif