Index: firmware/App/Services/FpgaRO.h
===================================================================
diff -u -r08fd3b3564f6852dec6d2038d37f66b8692fdf44 -r7b9a8c0cb9986368e1e38fcdb9daaf3cf707dfd2
--- firmware/App/Services/FpgaRO.h	(.../FpgaRO.h)	(revision 08fd3b3564f6852dec6d2038d37f66b8692fdf44)
+++ firmware/App/Services/FpgaRO.h	(.../FpgaRO.h)	(revision 7b9a8c0cb9986368e1e38fcdb9daaf3cf707dfd2)
@@ -44,90 +44,90 @@
 void setFPGAValveStates( U16 valveStates );
 U16  getFPGAValveStates( void );
 
-void setROPumpEnable( BOOL enable );
-void setROPumpPWM( U16 pwm );
-U16  getROPumpPWM( void );
-U16  getROPumpTachCount( void );
+void setFPGAP12PumpEnable( BOOL enable );
+void setFPGAP12PumpPWM( U16 pwm );
+U16  getFPGAP12PumpPWM( void );
+U16  getFPGAP12PumpTachCount( void );
 
-void setFPGAHeaterEnabled( BOOL enable );
-void setFPGAHeaterPWM( U16 pwm );
+void setFPGAP24Enabled( BOOL enable );
+void setFPGAP24PWM( U16 pwm );
 
-S16  getFPGAPRiRawPressure( void );
-S16  getFPGAPRiRawTemperature( void );
-U08  getFPGAPRiReadCount( void );
-U08  getFPGAPRiErrorCount( void );
+S16  getFPGAM1RawPressure( void );
+S16  getFPGAM1RawTemperature( void );
+U08  getFPGAM1ReadCount( void );
+U08  getFPGAM1ErrorCount( void );
 
-S16  getFPGAPRoRawPressure( void );
-S16  getFPGAPRoRawTemperature( void );
-U08  getFPGAPRoReadCount( void );
-U08  getFPGAPRoErrorCount( void );
+S16  getFPGAM3RawPressure( void );
+S16  getFPGAM3RawTemperature( void );
+U08  getFPGAM3ReadCount( void );
+U08  getFPGAM3ErrorCount( void );
 
-S16  getFPGAPC2oRawPressure( void );
-S16  getFPGAPC2oRawTemperature( void );
-U08  getFPGAPC2oReadCount( void );
-U08  getFPGAPC2oErrorCount( void );
+S16  getFPGAP8RawPressure( void );
+S16  getFPGAP8RawTemperature( void );
+U08  getFPGAP8ReadCount( void );
+U08  getFPGAP8ErrorCount( void );
 
-S16  getFPGAPPoRawPressure( void );
-S16  getFPGAPPoRawTemperature( void );
-U08  getFPGAPPoReadCount( void );
-U08  getFPGAPPoErrorCount( void );
+S16  getFPGAP13RawPressure( void );
+S16  getFPGAP13RawTemperature( void );
+U08  getFPGAP13ReadCount( void );
+U08  getFPGAP13ErrorCount( void );
 
-S16  getFPGAPMpRawPressure( void );
-S16  getFPGAPMpRawTemperature( void );
-U08  getFPGAPMpReadCount( void );
-U08  getFPGAPMpErrorCount( void );
+S16  getFPGAP17RawPressure( void );
+S16  getFPGAP17RawTemperature( void );
+U08  getFPGAP17ReadCount( void );
+U08  getFPGAP17ErrorCount( void );
 
-S16  getFPGAPPiRawPressure( void );
-S16  getFPGAPPiRawTemperature( void );
-U08  getFPGAPPiReadCount( void );
-U08  getFPGAPPiErrorCount( void );
+S16  getFPGAX1RawPressure( void );
+S16  getFPGAX1RawTemperature( void );
+U08  getFPGAX1ReadCount( void );
+U08  getFPGAX1ErrorCount( void );
 
-U32  getFPGATro1Temperature( void );
-U32  getFPGATro2Temperature( void );
+U32  getFPGAP23Temperature( void );
+U32  getFPGAP22Temperature( void );
 
-U08  getFPGAFloaterState( void );
+U08  getFPGAP25FloaterState( void );
 
-U16  getFPGAFlowFMP( void );
-U16  getFPGAFlowFMPTemp( void );
-U16  getFPGAFlowFMS( void );
-U16  getFPGAFlowFMSTemp( void );
+U16  getFPGAFlowP16( void );
+U16  getFPGAFlowP16Temp( void );
+U16  getFPGAFlowP7( void );
+U16  getFPGAFlowP7Temp( void );
 
-void setFPGACPiControl( U08 control );
-void setFPGACPiAddress( U16 address );
-void setFPGACPiData( U32 data );
-void setFPGACPoControl( U08 control );
-void setFPGACPoAddress( U16 address );
-void setFPGACPoData( U32 data );
+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 setFPGACPiReset( void );
-void clearFPGACPiReset( void );
-void setFPGACPiInitEnable( void );
-void clearFPGACPiInitEnable( void );
-void setFPGACPiWriteEnable( void );
-void clearFPGACPiWriteEnable( void );
-void setFPGACPiReadEnable( void );
-void clearFPGACPiReadEnable( void );
+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 setFPGACPoReset( void );
-void clearFPGACPoReset( void );
-void setFPGACPoInitEnable( void );
-void clearFPGACPoInitEnable( void );
-void setFPGACPoWriteEnable( void );
-void clearFPGACPoWriteEnable( void );
-void setFPGACPoReadEnable( void );
-void clearFPGACPoReadEnable( 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  getFPGACPiReadCount( void );
-U08  getFPGACPiErrorCount( void );
-U16  getFPGACPiConductivity( void );
-U16  getFPGACPiTemperature( void );
-U32  getFPGACPiData( void );
+U08  getFPGAP9ReadCount( void );
+U08  getFPGAP9ErrorCount( void );
+U16  getFPGAP9Conductivity( void );
+U16  getFPGAP9Temperature( void );
+U32  getFPGAP9Data( void );
 
-U08  getFPGACPoReadCount( void );
-U08  getFPGACPoErrorCount( void );
-U16  getFPGACPoConductivity( void );
-U16  getFPGACPoTemperature( void );
-U32  getFPGACPoData( void );
+U08  getFPGAP18ReadCount( void );
+U08  getFPGAP18ErrorCount( void );
+U16  getFPGAP18Conductivity( void );
+U16  getFPGAP18Temperature( void );
+U32  getFPGAP18Data( void );
 
 /**@}*/