Index: firmware/App/Services/FpgaDD.h
===================================================================
diff -u -rf7c714a1a09b10d85a8b013712532d37b4d7b97a -r3cc784af591b14e5d292f92c796db70bcbd5a40b
--- firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision f7c714a1a09b10d85a8b013712532d37b4d7b97a)
+++ firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision 3cc784af591b14e5d292f92c796db70bcbd5a40b)
@@ -54,77 +54,207 @@
 // 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 setFPGACD12Data( U16 data );
-void setFPGACD34Data( U16 data );
+void setFPGACD5Address( U16 address );
+void setFPGACD12Data( U32 data );
+void setFPGACD34Data( U32 data );
+void setFPGACD5Data( U32 data );
 
-U08 getFPGACD1ReadCount( void );
-U08 getFPGACD1ErrorCount( void );
-U16 getFPGACD1( void );
-U16 getFPGACD1Temp( void );
-U16 getFPGACD1Data( void );
+void setFPGAD17CondReset( void );
+void clearFPGAD17CondReset( void );
+void setFPGAD17CondInitEnable( void );
+void clearFPGAD17CondInitEnable( void );
+void setFPGAD17CondWriteEnable( void );
+void clearFPGAD17CondWriteEnable( void );
+void setFPGAD17CondReadEnable( void );
+void clearFPGAD17CondReadEnable( void );
 
-U08 getFPGACD2ReadCount( void );
-U08 getFPGACD2ErrorCount( void );
-U16 getFPGACD2( void );
-U16 getFPGACD2Temp( void );
-U16 getFPGACD2Data( void );
+void setFPGAD27CondReset( void );
+void clearFPGAD27CondReset( void );
+void setFPGAD27CondInitEnable( void );
+void clearFPGAD27CondInitEnable( void );
+void setFPGAD27CondWriteEnable( void );
+void clearFPGAD27CondWriteEnable( void );
+void setFPGAD27CondReadEnable( void );
+void clearFPGAD27CondReadEnable( void );
 
-U08 getFPGACD3ReadCount( void );
-U08 getFPGACD3ErrorCount( void );
-U16 getFPGACD3( void );
-U16 getFPGACD3Temp( void );
-U16 getFPGACD3Data( void );
+void setFPGAD29CondReset( void );
+void clearFPGAD29CondReset( void );
+void setFPGAD29CondInitEnable( void );
+void clearFPGAD29CondInitEnable( void );
+void setFPGAD29CondWriteEnable( void );
+void clearFPGAD29CondWriteEnable( void );
+void setFPGAD29CondReadEnable( void );
+void clearFPGAD29CondReadEnable( void );
 
-U08 getFPGACD4ReadCount( void );
-U08 getFPGACD4ErrorCount( void );
-U16 getFPGACD4( void );
-U16 getFPGACD4Temp( void );
-U16 getFPGACD4Data( void );
+void setFPGAD43CondReset( void );
+void clearFPGAD43CondReset( void );
+void setFPGAD43CondInitEnable( void );
+void clearFPGAD43CondInitEnable( void );
+void setFPGAD43CondWriteEnable( void );
+void clearFPGAD43CondWriteEnable( void );
+void setFPGAD43CondReadEnable( void );
+void clearFPGAD43CondReadEnable( void );
 
-// Pumps ( Concentrate and Gear pumps )
-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 );
+void setFPGAD74CondReset( void );
+void clearFPGAD74CondReset( void );
+void setFPGAD74CondInitEnable( void );
+void clearFPGAD74CondInitEnable( void );
+void setFPGAD74CondWriteEnable( void );
+void clearFPGAD74CondWriteEnable( void );
+void setFPGAD74CondReadEnable( void );
+void clearFPGAD74CondReadEnable( void );
 
-U08 getFPGADialysateOutPumpControl( void );
-U08 getFPGADialysateInPumpControl( void );
+U08 getFPGAD17CondReadCount( void );
+U08 getFPGAD17CondErrorCount( void );
+U16 getFPGAD17Cond( void );
+U16 getFPGAD17CondTemp( void );
+U32 getFPGAD17CondData( void );
 
+U08 getFPGAD27CondReadCount( void );
+U08 getFPGAD27CondErrorCount( void );
+U16 getFPGAD27Cond( void );
+U16 getFPGAD27CondTemp( void );
+U32 getFPGAD27CondData( void );
+
+U08 getFPGAD29CondReadCount( void );
+U08 getFPGAD29CondErrorCount( void );
+U16 getFPGAD29Cond( void );
+U16 getFPGAD29CondTemp( void );
+U32 getFPGAD29CondData( void );
+
+U08 getFPGAD43CondReadCount( void );
+U08 getFPGAD43CondErrorCount( void );
+U16 getFPGAD43Cond( void );
+U16 getFPGAD43CondTemp( void );
+U32 getFPGAD43CondData( void );
+
+U08 getFPGAD74CondReadCount( void );
+U08 getFPGAD74CondErrorCount( void );
+U16 getFPGAD74Cond( void );
+U16 getFPGAD74CondTemp( void );
+U32 getFPGAD74CondData( void );
+
+// Pumps  (Concentrate and Gear pumps )
+void setFPGAD11PumpSetStepSpeed( U16 stepSpeed );
+void setFPGAD10PumpSetStepSpeed( U16 stepSpeed );
+void setFPGAD76PumpSetStepSpeed( U16 stepSpeed );
+void setFPGAD11PumpControl( U08 control );
+void setFPGAD10PumpControl( U08 control );
+void setFPGAD76PumpControl( U08 control );
+void setFPGAD11PumpParkCmd( void );
+void setFPGAD10PumpParkCmd( void );
+void setFPGAD76PumpParkCmd( void );
+void setFPGAD11PumpRevolutionCount( U16 count );
+void setFPGAD10PumpRevolutionCount( U16 count );
+void setFPGAD76PumpRevolutionCount( U16 count );
+
+U08 getFPGAD11PumpControlStatus( void );
+U08 getFPGAD10PumpControlStatus( void );
+U08 getFPGAD76PumpControlStatus( void );
+//TODO : UF pump park yet to defined in HDD
+U08 getFPGAConcentratePumpsFault( void );
+BOOL getFPGAD11PumpIsParked( void );
+BOOL getFPGAD10PumpIsParked( void );
+BOOL getFPGAD11PumpParkFault( void );
+BOOL getFPGAD10PumpParkFault( void );
+U16 getFPGAD11PumpHallSensePulseWidth( void );
+U16 getFPGAD10PumpHallSensePulseWidth( void );
+U16 getFPGAD76PumpHallSensePulseWidth( void );
+U16 getFPGAD11PumpRevolutionCountStatus( void );
+U16 getFPGAD10PumpRevolutionCountStatus( void );
+U16 getFPGAD76PumpRevolutionCountStatus( void );
+
+void setFPGAD48PumpSpeed( U16 speed );
+void setFPGAD12PumpSpeed( U16 speed );
+void setFPGAD48PumpControl( U08 control );
+void setFPGAD12PumpControl( U08 control );
+
+U08 getFPGAD48PumpControl( void );
+U08 getFPGAD12PumpControl( void );
+U16 getFPGAD48PumpSpeed( void );
+U16 getFPGAD12PumpSpeed( void );
+BOOL getFPGAD12PumpErrorStatus( void );
+BOOL getFPGAD48PumpErrorStatus( void );
+U16 getFPGAD12PumpCurrentFeedback( void );
+U16 getFPGAD48PumpCurrentFeedback( void );
+U08 getFPGAD12PumpHallDirectionStatus( void );
+U08 getFPGAD48PumpHallDirectionStatus( void );
+
 //Pressure sensor
-U08 getFPGAPnReadCount( void );
-U08 getFPGAPnErrorCount( void );
-U32 getFPGAPnRawPressure( void );
-U32 getFPGAPnRawTemperature( void );
+U08 getFPGAD9PresReadCount( void );
+U08 getFPGAD9PresErrorCount( void );
+U16 getFPGAD9PresRawPressure( void );
+U16 getFPGAD9PresRawTemperature( void );
 
-U08 getFPGAPCbReadCount( void );
-U08 getFPGAPCbErrorCount( void );
-U32 getFPGAPCbRawPressure( void );
-U32 getFPGAPCbRawTemperature( void );
+U08 getFPGAD66PresReadCount( void );
+U08 getFPGAD66PresErrorCount( void );
+U16 getFPGAD66PresRawPressure( void );
+U16 getFPGAD66PresRawTemperature( void );
 
-U08 getFPGAPDsReadCount( void );
-U08 getFPGAPDsErrorCount( void );
-U32 getFPGAPDsRawPressure( void );
-U32 getFPGAPDsRawTemperature( void );
+U08 getFPGAD51PresReadCount( void );
+U08 getFPGAD51PresErrorCount( void );
+U16 getFPGAD51PresRawPressure( void );
+U16 getFPGAD51PresRawTemperature( void );
 
-U08 getFPGAPDfReadCount( void );
-U08 getFPGAPDfErrorCount( void );
-U32 getFPGAPDfRawPressure( void );
-U32 getFPGAPDfRawTemperature( void );
+U08 getFPGAD18PresReadCount( void );
+U08 getFPGAD18PresErrorCount( void );
+U16 getFPGAD18PresRawPressure( void );
+U16 getFPGAD18PresRawTemperature( void );
 
-U08 getFPGAPtmReadCount( void );
-U08 getFPGAPtmErrorCount( void );
-U32 getFPGAPtmRawPressure( void );
-U32 getFPGAPtmRawTemperature( 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 getFPGALevelSensor1( void );
-U16 getFPGALevelSensor2( void );
+U16  getFPGAD63LevelSensor( void );
+U16  getFPGAD46LevelSensor( void );
+BOOL getFPGAD6LevelStatus( void );
+U08  getFPGAFloater2Status( void );
 
+//Temperature sensors
+U32 getFPGAD1Temp( void );
+U32 getFPGAX6Temp( 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 );
+void setFPGAD5HeaterOnOffControl( BOOL flag );
+void setFPGAD5HeaterPWMEnableControl( BOOL enable );
+void setFPGAD5HeaterPWMLowState( U16 count );
+void setFPGAD5HeaterPWMPeriod( U16 period );
+
 /**@}*/
 
 #endif