Index: firmware/App/Services/FPGADD.h
===================================================================
diff -u -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4 -r08bb699be47b9b04c9d4885b7f1b9349b5a4b1e9
--- firmware/App/Services/FPGADD.h	(.../FPGADD.h)	(revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4)
+++ firmware/App/Services/FPGADD.h	(.../FPGADD.h)	(revision 08bb699be47b9b04c9d4885b7f1b9349b5a4b1e9)
@@ -41,33 +41,103 @@
 void checkFPGACommFailure( void );
 BOOL checkFPGAFEOEFailure( void );
 
+//Set FPGA functions
 void setFPGAValveStates( U16 valveStates );
-void setFPGADrainPumpSpeed( U08 drainPumpDAC );
-void setFPGACPoProbeType( U16 probeType );
-void setFPGACPiProbeType( U16 probeType );
-void setFPGAV3AcidPumpControl( U08 pumpControl );
-void setFPGAV3BicarbPumpControl( U08 pumpControl );
-void setFPGAV3AcidPumpParkCmd( void );
-void setFPGAV3BicarbPumpParkCmd( void );
+void setFPGABCValveStates( U08 valveStates );
+void setFPGAUFValveStates( U08 valveStates );
+
+void setFPGACD12Control( U08 control );
+void setFPGACD34Control( U08 control );
+void setFPGACD12Address( U16 address );
+void setFPGACD34Address( U16 address );
+void setFPGACD12Data( U16 data );
+void setFPGACD34Data( U16 data );
+
 void setFPGAAcidPumpSetStepSpeed( U16 stepSpeed );
 void setFPGABicarbSetStepSpeed( U16 stepSpeed );
+void setFPGADialysateOutPumpSpeed( U16 speed );
+void setFPGADialysateOutPumpControl( U08 control );
+void setFPGADialysateInPumpControl( U08 control );
 
+void setFPGAAcidPumpControl( U08 control );
+void setFPGABicarbPumpControl( U08 control );
+
+// Get FPGA functions
 void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab );
 U16 getFPGAValveStates( void );
-U16 getFPGAROPumpFlowRate( void );
-U16 getFPGADialysateFlowRate( void );
-U16 getFPGADrainPumpSpeed( void );
-U32 getFPGALoadCellA1( void );
-U32 getFPGALoadCellA2( void );
-U32 getFPGALoadCellB1( void );
-U32 getFPGALoadCellB2( void );
 
-U32 getFPGATPiTemp( void );
-U32 getFPGATPoTemp( void );
+U16 getFPGALevelSensor1( void );
+U16 getFPGALevelSensor2( void );
 
-U32 getFPGACD1Temp( void );
-U32 getFPGACD2Temp( void );
+U08 getFPGACD1ReadCount( void );
+U08 getFPGACD1ErrorCount( void );
+U16 getFPGACD1( void );
+U16 getFPGACD1Temp( void );
+U16 getFPGACD1Data( void );
 
+U08 getFPGACD2ReadCount( void );
+U08 getFPGACD2ErrorCount( void );
+U16 getFPGACD2( void );
+U16 getFPGACD2Temp( void );
+U16 getFPGACD2Data( void );
+
+U08 getFPGACD3ReadCount( void );
+U08 getFPGACD3ErrorCount( void );
+U16 getFPGACD3( void );
+U16 getFPGACD3Temp( void );
+U16 getFPGACD3Data( void );
+
+U08 getFPGACD4ReadCount( void );
+U08 getFPGACD4ErrorCount( void );
+U16 getFPGACD4( void );
+U16 getFPGACD4Temp( void );
+U16 getFPGACD4Data( void );
+
+U08 getFPGAPnReadCount( void );
+U08 getFPGAPnErrorCount( void );
+U32 getFPGAPnRawPressure( void );
+U32 getFPGAPnRawTemperature( void );
+
+U08 getFPGAPCbReadCount( void );
+U08 getFPGAPCbErrorCount( void );
+U32 getFPGAPCbRawPressure( void );
+U32 getFPGAPCbRawTemperature( void );
+
+U08 getFPGAPDsReadCount( void );
+U08 getFPGAPDsErrorCount( void );
+U32 getFPGAPDsRawPressure( void );
+U32 getFPGAPDsRawTemperature( void );
+
+U08 getFPGAPDfReadCount( void );
+U08 getFPGAPDfErrorCount( void );
+U32 getFPGAPDfRawPressure( void );
+U32 getFPGAPDfRawTemperature( void );
+
+U08 getFPGADialysateOutPumpControl( void );
+U08 getFPGADialysateInPumpControl( void );
+
+U08 getFPGAPtmReadCount( void );
+U08 getFPGAPtmErrorCount( void );
+U32 getFPGAPtmRawPressure( void );
+U32 getFPGAPtmRawTemperature( void );
+
+U16 getFPGATimerCount( void );
+
+//=====================================================
+// ToDo : clean up required on following set functions
+//=====================================================
+void setFPGADrainPumpSpeed( U08 drainPumpDAC );
+void setFPGACPoProbeType( U16 probeType );
+void setFPGACPiProbeType( U16 probeType );
+void setFPGAAcidPumpParkCmd( void );
+void setFPGABicarbPumpParkCmd( void );
+//======================================================
+
+//====================================================
+//Todo : Following get functions need clean up
+//====================================================
+U16 getFPGADrainPumpSpeed( void );
+
 U08 getFPGARTDErrorCount( void );
 U08 getFPGARTDReadCount( void );
 
@@ -90,43 +160,16 @@
 U16 getFPGAPrimaryColdJunctionTemp( void );
 U16 getFPGATrimmerColdJunctionTemp( void );
 
-U08 getFPGACPiFault( void );
-U08 getFPGACPiReadCount( void );
-U08 getFPGACPiErrorCount( void );
-U32 getFPGACPi( void );
-
-U08 getFPGACPoFault( void );
-U08 getFPGACPoReadCount( void );
-U08 getFPGACPoErrorCount( void );
-U32 getFPGACPo( void );
-
 U08  getFPGAConcentratePumpsFault( void );
 BOOL getFPGAAcidPumpIsParked( void );
 BOOL getFPGABicarbPumpIsParked( void );
 BOOL getFPGAAcidPumpParkFault( void );
 BOOL getFPGABicarbPumpParkFault( void );
 
-U08 getFPGAEmstatCD1CD2OutByte( void );
-U08 getFPGAEmstatCD1CD2RxErrCount( void );
-U16 getFPGAEmstatCD1CD2RxFifoCount( void );
-
 U16 getFPGACP1HallSensePulseWidth( void );
 U16 getFPGACP2HallSensePulseWidth( void );
 
-void getFPGAAccelAxes( S16 *x, S16 *y, S16 *z );
-void getFPGAAccelMaxes( S16 *xm, S16*ym, S16*zm );
-void getFPGAAccelStatus( U16 *cnt, U16 *accelFPGAFaultReg );
-
-U16 getFPGAInletFan1TogglePeriod( void );
-U16 getFPGAInletFan2TogglePeriod( void );
-U16 getFPGAInletFan3TogglePeriod( void );
-U16 getFPGAOutletFan1TogglePeriod( void );
-U16 getFPGAOutletFan2TogglePeriod( void );
-U16 getFPGAOutletFan3TogglePeriod( void );
-
 U16 getFPGABoardTemp( void );
-U32 getFPGALoadCellsA1B1Temp( void );
-U32 getFPGALoadCellsA2B2Temp( void );
 U32 getFPGATRoInternalTemp( void );
 U32 getFPGATDiInternalTemp( void );
 U32 getFPGACondSnsrInternalTemp( void );
@@ -139,28 +182,13 @@
 
 BOOL noFPGAFluidLeakDetected( void );
 
-U16 getFPGATimerCount( void );
-
 U08 getFPGADialysateCapStatus( void );
 U08 getFPGAConcentrateCapStatus( void );
 
 U16 getFPGAInternalVccVoltage( void );
 U16 getFPGAInternalVccAuxiliaryVoltage( void );
 U16 getFPGAVPVNVoltage( void );
 
-//#ifndef _RELEASE_
-//HARDWARE_CONFIG_T getHardwareConfigStatus( void );
-//#endif
-
-//***************** DVT Functions ***************************/
-
-void setFPGAAcidPumpControl( U08 control );
-U08 getFPGAAcidPumpControlStatus( void );
-void setFPGABicarbPumpControl( U08 control );
-U08 getFPGABicarbPumpControlStatus( void );
-void setFPGAAcidPumpParkCmd( void );
-void setFPGABicarbPumpParkCmd( void );
-
 U08 getFPGABaroReadCount( void );
 U08 getFPGABaroErrorCount( void );
 U16 getFPGABaroMfgInfo( void );
@@ -174,18 +202,11 @@
 U32 getFPGABaroPressure( void );
 U32 getFPGABaroTemperature( void );
 
-U08 getFPGAEmstatCPiCPoByteOut( void );
-U16 getFPGAEmstatCPiCPoRxFifoCount( void );
-U08 getFPGAEmstatCPiCPoRxErrCount( void );
-
 U32 getFPGATHdTemp( void );
 U32 getFPGATHdInternalTemp( void );
 U08 getFPGATHdReadCount( void );
 U08 getFPGATHdErrorCount( void );
 
-U16 getFPGAROFlowSensorEdgeCount( void );
-U16 getFPGADialysateFlowSensorEdgeCount( void );
-
 U16 getFPGAHeaterGateADC( void );
 U16 getFPGAHeaterGndADC( void );
 U08 getFPGAHeaterGateADCReadCount( void );
@@ -197,7 +218,9 @@
 
 U16 getFPGAOnBoardThermistorCount( void );
 U16 getFPGAPowerSupply2ThermistorCount( void );
+//====================================================
 
+
 /**@}*/
 
 #endif