Index: firmware/App/Services/FpgaDD.h
===================================================================
diff -u -r498757853c009a4e25dec98461be91fcadd8057d -r5147570b8c12a721fe05ec9aa5dd38baa6c3a931
--- firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision 498757853c009a4e25dec98461be91fcadd8057d)
+++ firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision 5147570b8c12a721fe05ec9aa5dd38baa6c3a931)
@@ -20,7 +20,6 @@
 
 #include "DDCommon.h"
 
-
 /**
  *  @defgroup FpgaDD FpgaDD
  *  @brief FPGA service unit. Provides functionality to interact with DD FPGA.
@@ -43,24 +42,24 @@
 void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab );
 
 //Valve
-void setFPGAValveStates( U16 valveStates );
+void setFPGADDValveStates( U16 valveStates );
 void setFPGABCValveStates( U08 valveStates );
-void setFPGAUFValveStates( U08 valveStates );
+void setFPGASpareValveStates( U08 valveStates );
 
-U16 getFPGAValveStates( void );
+U16 getFPGADDValveStates( void );
 U08 getFPGAValveBCStates( void );
-U08 getFPGAValveUFStates( void );
+U08 getFPGAValveSpStates( void );
 
 // Conductivity and Temperature Sensor
-void setFPGACD12Control( U08 control );
-void setFPGACD34Control( U08 control );
-void setFPGACD5Control( U08 control );
-void setFPGACD12Address( U16 address );
-void setFPGACD34Address( U16 address );
-void setFPGACD5Address( U16 address );
-void setFPGACD12Data( U32 data );
-void setFPGACD34Data( U32 data );
-void setFPGACD5Data( U32 data );
+void setFPGAD17D74Control( U08 control );
+void setFPGAD27D29Control( U08 control );
+void setFPGAD43Control( U08 control );
+void setFPGAD17D74Address( U16 address );
+void setFPGAD27D29Address( U16 address );
+void setFPGAD43Address( U16 address );
+void setFPGAD17D74Data( U32 data );
+void setFPGAD27D29Data( U32 data );
+void setFPGAD43Data( U32 data );
 
 void setFPGAD17CondReset( void );
 void clearFPGAD17CondReset( void );
@@ -186,41 +185,21 @@
 U08 getFPGAD48PumpHallDirectionStatus( void );
 
 //Pressure sensor
-U08 getFPGAD9PresReadCount( void );
-U08 getFPGAD9PresErrorCount( void );
 U16 getFPGAD9PresRawPressure( void );
 U16 getFPGAD9PresRawTemperature( void );
 
-U08 getFPGAD66PresReadCount( void );
-U08 getFPGAD66PresErrorCount( void );
 U16 getFPGAD66PresRawPressure( void );
 U16 getFPGAD66PresRawTemperature( void );
 
-U08 getFPGAD51PresReadCount( void );
-U08 getFPGAD51PresErrorCount( void );
 U16 getFPGAD51PresRawPressure( void );
 U16 getFPGAD51PresRawTemperature( void );
 
-U08 getFPGAD18PresReadCount( void );
-U08 getFPGAD18PresErrorCount( void );
 U16 getFPGAD18PresRawPressure( void );
 U16 getFPGAD18PresRawTemperature( void );
 
-U08 getFPGAD41PresReadCount( void );
-U08 getFPGAD41PresErrorCount( void );
 U16 getFPGAD41PresRawPressure( void );
 U16 getFPGAD41PresRawTemperature( void );
 
-U08 getFPGAM1PresReadCount( void );
-U08 getFPGAM1PresErrorCount( void );
-U16 getFPGAM1PresRawPressure( void );
-U16 getFPGAM1PresRawTemperature( void );
-
-U08 getFPGAM3PresReadCount( void );
-U08 getFPGAM3PresErrorCount( void );
-U16 getFPGAM3PresRawPressure( void );
-U16 getFPGAM3PresRawTemperature( void );
-
 //Level sensor
 U16  getFPGAD63LevelSensor( void );
 U16  getFPGAD46LevelSensor( void );
@@ -229,26 +208,12 @@
 
 //Temperature sensors
 U32 getFPGAD1Temp( void );
-U32 getFPGAX6Temp( void );
+U32 getFPGAD78Temp( void );
 U32 getFPGAD4Temp( void );
 U32 getFPGAD50Temp( void );
 U08 getFPGARTDReadCount( void );
 U08 getFPGARTDCountErrorCycles( void );
 
-//Barometric sensor
-U08 getFPGABaroReadCount( void );
-U08 getFPGABaroErrorCount( void );
-U16 getFPGABaroMfgInfo( void );
-U16 getFPGABaroPressureSensitivity( void );
-U16 getFPGABaroPressureOffset( void );
-U16 getFPGABaroTempCoeffOfPressSensitvity( void );
-U16 getFPGABaroTempCoeffOfPressOffset( void );
-U16 getFPGABaroReferenceTemperature( void );
-U16 getFPGABaroTempCoeffOfTemperature( void );
-U16 getFPGABaroCoeffsCRC( void );
-U32 getFPGABaroPressure( void );
-U32 getFPGABaroTemperature( void );
-
 //Primary and Trimmer heater
 void setFPGAD5HeaterPWMControl( U08 control );
 void setFPGAD45HeaterPWMControl( U08 control );
@@ -266,6 +231,81 @@
 U08  getFPGABloodLeakRxErrorCount( void );
 U08  getFPGABloodLeakRxFIFODataOut( void );
 
+//*************** IOFP *******************
+
+void setFPGAIOFPValveStates( U16 valveStates );
+U16  getFPGAIOFPValveStates( void );
+
+void setFPGAP12PumpEnable( BOOL enable );
+void setFPGAP12PumpPWM( U16 pwm );
+U16  getFPGAP12PumpPWM( void );
+U16  getFPGAP12PumpTachCount( void );
+
+void setFPGAP24Enabled( BOOL enable );
+void setFPGAP24PWM( U16 pwm );
+
+S16  getFPGAM1RawPressure( void );
+S16  getFPGAM1RawTemperature( void );
+S16  getFPGAM3RawPressure( void );
+S16  getFPGAM3RawTemperature( void );
+S16  getFPGAP8RawPressure( void );
+S16  getFPGAP8RawTemperature( void );
+S16  getFPGAP13RawPressure( void );
+S16  getFPGAP13RawTemperature( void );
+S16  getFPGAP17RawPressure( void );
+S16  getFPGAP17RawTemperature( void );
+U32  getFPGAP23Temperature( void );
+U32  getFPGAP22Temperature( void );
+
+U08  getFPGAP25FloaterState( void );
+
+U16  getFPGAFlowP16( void );
+U16  getFPGAFlowP16Temp( void );
+U16  getFPGAFlowP7( void );
+U16  getFPGAFlowP7Temp( void );
+
+void setFPGAP9Control( U08 control );
+void setFPGAP9Address( U16 address );
+void setFPGAP9Data( U32 data );
+void setFPGAP18Control( U08 control );
+void setFPGAP18Address( U16 address );
+void setFPGAP18Data( U32 data );
+
+void setFPGAP9Reset( void );
+void clearFPGAP9Reset( void );
+void setFPGAP9InitEnable( void );
+void clearFPGAP9InitEnable( void );
+void setFPGAP9WriteEnable( void );
+void clearFPGAP9WriteEnable( void );
+void setFPGAP9ReadEnable( void );
+void clearFPGAP9ReadEnable( void );
+
+void setFPGAP18Reset( void );
+void clearFPGAP18Reset( void );
+void setFPGAP18InitEnable( void );
+void clearFPGAP18InitEnable( void );
+void setFPGAP18WriteEnable( void );
+void clearFPGAP18WriteEnable( void );
+void setFPGAP18ReadEnable( void );
+void clearFPGAP18ReadEnable( void );
+
+U08  getFPGAP9ReadCount( void );
+U08  getFPGAP9ErrorCount( void );
+U16  getFPGAP9Conductivity( void );
+U16  getFPGAP9Temperature( void );
+U32  getFPGAP9Data( void );
+
+U08  getFPGAP18ReadCount( void );
+U08  getFPGAP18ErrorCount( void );
+U16  getFPGAP18Conductivity( void );
+U16  getFPGAP18Temperature( void );
+U32  getFPGAP18Data( void );
+
+void setFPGAP40PumpEnable( BOOL enable );
+void setFPGAP40PumpPWM( U16 pwm );
+U16  getFPGAP40PumpPWM( void );
+U16  getFPGAP40PumpTachCount( void );
+
 /**@}*/
 
 #endif