Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -r04f033af4174bf41a7aa0ff9ccaae45b77472e01 -r44a100f8e5210a02c23b8fcc4527d8e96d577381
--- firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 04f033af4174bf41a7aa0ff9ccaae45b77472e01)
+++ firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
@@ -52,16 +52,24 @@
 
 void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab );
 
-void setAlarmAudioState( ALARM_PRIORITY_T state, U32 volumeLevel );
+void setAlarmAudioState( U32 state, U32 volumeLevel );
 
 F32 getFPGABloodFlowSignalStrength( void );
 F32 getFPGADialysateFlowSignalStrength( void );
 
 F32 getFPGABloodFlow( void );
-F32 getFPGADialysateFlow( void );
-
 U08 getFPGABloodFlowMeterStatus( void );
+U08 getFPGABloodFlowFastPacketReadCounter( void );
+U08 getFPGABloodFlowSlowPacketReadCounter( void );
+U08 getFPGABloodFlowStatusPacketReadCounter( void );
+U08 getFPGABloodFlowErrorCounter( void );
+
+F32 getFPGADialysateFlow( void );
 U08 getFPGADialysateFlowMeterStatus( void );
+U08 getFPGADialysateFlowFastPacketReadCounter( void );
+U08 getFPGADialysateFlowSlowPacketReadCounter( void );
+U08 getFPGADialysateFlowStatusPacketReadCounter( void );
+U08 getFPGADialysateFlowErrorCounter( void );
 
 U16 getFPGABloodPumpHallSensorCount( void );
 U08 getFPGABloodPumpHallSensorStatus( void );
@@ -72,9 +80,17 @@
 
 U32 getFPGAArterialPressure( void );
 U16 getFPGAVenousPressure( void );
+F32 getFPGAVenousPressureTemperature( void );
+U08 getFPGAVenousPressureReadCounter( void );
 U16 getFPGABloodPumpOcclusion( void );
 U16 getFPGADialInPumpOcclusion( void );
 U16 getFPGADialOutPumpOcclusion( void );
+U08 getFPGABloodPumpOcclusionReadCounter( void );
+U08 getFPGADialInPumpOcclusionReadCounter( void );
+U08 getFPGADialOutPumpOcclusionReadCounter( void );
+U08 getFPGABloodPumpOcclusionErrorCounter( void );
+U08 getFPGADialInPumpOcclusionErrorCounter( void );
+U08 getFPGADialOutPumpOcclusionErrorCounter( void );
 
 void setFPGASyringePumpControlFlags( U08 bitFlags );
 void setFPGASyringePumpADCandDACControlFlags( U08 bitFlags );
@@ -90,13 +106,13 @@
 U16  getFPGASyringePumpADCChannel2( void );
 U16  getFPGASyringePumpADCChannel3( void );
 
+U16 getFPGATimerCount( void );
+
 void getFPGAAccelAxes( S16 *x, S16 *y, S16 *z );
 void getFPGAAccelMaxes( S16 *xm, S16*ym, S16*zm );
 void getFPGAAccelStatus( U16 *cnt, U16 *accelFPGAFaultReg );
 
 void getFPGAAirTrapLevels( BOOL *airAtLower, BOOL *airAtUpper );
-BOOL getFPGAArterialAirBubbleStatus( void );
-BOOL getFPGAVenousAirBubbleStatus( void );
 
 void setFPGASensorTest( U08 sensorTest );
 
@@ -114,6 +130,10 @@
 void setFPGABloodLeakSelfTest( void );
 void clearFPGABloodLeakSelfTest( void );
 
+BOOL noFPGABubbleDetected( U32 bubble );
+void setFPGABubbleSelfTest( U32 bubble );
+void clearFPGABubbleSelfTest( U32 bubble );
+
 void setFPGAValveDialyzerInletPosition( S16 setPoint );
 S16 getFPGAValveDialyzerInletPosition( void );
 U16 getFPGAValveDialyzerInletCurrentCounts( void );