Index: firmware/App/Services/FpgaDD.h
===================================================================
diff -u -rbce6e6d1cfb6e8a0b186419416460ead3a44e5e1 -r322747d530c1b8205be257557e53dcfe9caad50a
--- firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision bce6e6d1cfb6e8a0b186419416460ead3a44e5e1)
+++ firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision 322747d530c1b8205be257557e53dcfe9caad50a)
@@ -59,148 +59,153 @@
 void setFPGACD12Data( U32 data );
 void setFPGACD34Data( U32 data );
 
-void setFPGACD1Reset( void );
-void clearFPGACD1Reset( void );
-void setFPGACD1InitEnable( void );
-void clearFPGACD1InitEnable( void );
-void setFPGACD1WriteEnable( void );
-void clearFPGACD1WriteEnable( void );
-void setFPGACD1ReadEnable( void );
-void clearFPGACD1ReadEnable( 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 );
 
-void setFPGACD2Reset( void );
-void clearFPGACD2Reset( void );
-void setFPGACD2InitEnable( void );
-void clearFPGACD2InitEnable( void );
-void setFPGACD2WriteEnable( void );
-void clearFPGACD2WriteEnable( void );
-void setFPGACD2ReadEnable( void );
-void clearFPGACD2ReadEnable( 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 );
 
-void setFPGACD3Reset( void );
-void clearFPGACD3Reset( void );
-void setFPGACD3InitEnable( void );
-void clearFPGACD3InitEnable( void );
-void setFPGACD3WriteEnable( void );
-void clearFPGACD3WriteEnable( void );
-void setFPGACD3ReadEnable( void );
-void clearFPGACD3ReadEnable( 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 );
 
-void setFPGACD4Reset( void );
-void clearFPGACD4Reset( void );
-void setFPGACD4InitEnable( void );
-void clearFPGACD4InitEnable( void );
-void setFPGACD4WriteEnable( void );
-void clearFPGACD4WriteEnable( void );
-void setFPGACD4ReadEnable( void );
-void clearFPGACD4ReadEnable( 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 );
 
-U08 getFPGACD1ReadCount( void );
-U08 getFPGACD1ErrorCount( void );
-U16 getFPGACD1( void );
-U16 getFPGACD1Temp( void );
-U32 getFPGACD1Data( void );
+U08 getFPGAD17CondReadCount( void );
+U08 getFPGAD17CondErrorCount( void );
+U16 getFPGAD17Cond( void );
+U16 getFPGAD17CondTemp( void );
+U32 getFPGAD17CondData( void );
 
-U08 getFPGACD2ReadCount( void );
-U08 getFPGACD2ErrorCount( void );
-U16 getFPGACD2( void );
-U16 getFPGACD2Temp( void );
-U32 getFPGACD2Data( void );
+U08 getFPGAD27CondReadCount( void );
+U08 getFPGAD27CondErrorCount( void );
+U16 getFPGAD27Cond( void );
+U16 getFPGAD27CondTemp( void );
+U32 getFPGAD27CondData( void );
 
-U08 getFPGACD3ReadCount( void );
-U08 getFPGACD3ErrorCount( void );
-U16 getFPGACD3( void );
-U16 getFPGACD3Temp( void );
-U32 getFPGACD3Data( void );
+U08 getFPGAD29CondReadCount( void );
+U08 getFPGAD29CondErrorCount( void );
+U16 getFPGAD29Cond( void );
+U16 getFPGAD29CondTemp( void );
+U32 getFPGAD29CondData( void );
 
-U08 getFPGACD4ReadCount( void );
-U08 getFPGACD4ErrorCount( void );
-U16 getFPGACD4( void );
-U16 getFPGACD4Temp( void );
-U32 getFPGACD4Data( void );
+U08 getFPGAD43CondReadCount( void );
+U08 getFPGAD43CondErrorCount( void );
+U16 getFPGAD43Cond( void );
+U16 getFPGAD43CondTemp( void );
+U32 getFPGAD43CondData( void );
 
 // Pumps  (Concentrate and Gear pumps )
-void setFPGAAcidPumpSetStepSpeed( U16 stepSpeed );
-void setFPGABicarbSetStepSpeed( U16 stepSpeed );
-void setFPGAAcidPumpControl( U08 control );
-void setFPGABicarbPumpControl( U08 control );
-void setFPGAAcidPumpParkCmd( void );
-void setFPGABicarbPumpParkCmd( void );
+void setFPGAD11PumpSetStepSpeed( U16 stepSpeed );
+void setFPGAD10PumpSetStepSpeed( U16 stepSpeed );
+void setFPGAD11PumpControl( U08 control );
+void setFPGAD10PumpControl( U08 control );
+void setFPGAD11PumpParkCmd( void );
+void setFPGAD10PumpParkCmd( void );
+void setFPGAD11PumpRevolutionCount( U16 count );
+void setFPGAD10PumpRevolutionCount( U16 count );
 
-U08 getFPGAAcidPumpControlStatus( void );
-U08 getFPGABicarbPumpControlStatus( void );
+U08 getFPGAD11PumpControlStatus( void );
+U08 getFPGAD10PumpControlStatus( void );
 U08 getFPGAConcentratePumpsFault( void );
-BOOL getFPGAAcidPumpIsParked( void );
-BOOL getFPGABicarbPumpIsParked( void );
-BOOL getFPGAAcidPumpParkFault( void );
-BOOL getFPGABicarbPumpParkFault( void );
-U16 getFPGACPAHallSensePulseWidth( void );
-U16 getFPGACPBHallSensePulseWidth( void );
+BOOL getFPGAD11PumpIsParked( void );
+BOOL getFPGAD10PumpIsParked( void );
+BOOL getFPGAD11PumpParkFault( void );
+BOOL getFPGAD10PumpParkFault( void );
+U16 getFPGAD11PumpHallSensePulseWidth( void );
+U16 getFPGAD10PumpHallSensePulseWidth( void );
+U16 getFPGAD11PumpRevolutionCountStatus( void );
+U16 getFPGAD10PumpRevolutionCountStatus( void );
 
-void setFPGASpentDialysatePumpSpeed( U16 speed );
-void setFPGAFreshDialysatePumpSpeed( U16 speed );
-void setFPGASpentDialysatePumpControl( U08 control );
-void setFPGAFreshDialysatePumpControl( U08 control );
+void setFPGAD48PumpSpeed( U16 speed );
+void setFPGAD12PumpSpeed( U16 speed );
+void setFPGAD48PumpControl( U08 control );
+void setFPGAD12PumpControl( U08 control );
 
-U08 getFPGASpentDialysatePumpControl( void );
-U08 getFPGAFreshDialysatePumpControl( void );
-U16 getFPGASpentDialysatePumpSpeed( void );
-U16 getFPGAFreshDialysatePumpSpeed( void );
-BOOL getFPGAFreshDialysatePumpErrorStatus( void );
-BOOL getFPGASpentDialysatePumpErrorStatus( void );
-U16 getFPGAFreshDialysatePumpCurrentFeedback( void );
-U16 getFPGASpentDialysatePumpCurrentFeedback( void );
-U08 getFPGAFreshDialysatePumpHallDirectionStatus( void );
-U08 getFPGASpentDialysatePumpHallDirectionStatus( void );
+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 );
-U16 getFPGAPnRawPressure( void );
-U16 getFPGAPnRawTemperature( void );
+U08 getFPGAD9PresReadCount( void );
+U08 getFPGAD9PresErrorCount( void );
+U16 getFPGAD9PresRawPressure( void );
+U16 getFPGAD9PresRawTemperature( void );
 
-U08 getFPGAPCbReadCount( void );
-U08 getFPGAPCbErrorCount( void );
-U16 getFPGAPCbRawPressure( void );
-U16 getFPGAPCbRawTemperature( void );
+U08 getFPGAD66PresReadCount( void );
+U08 getFPGAD66PresErrorCount( void );
+U16 getFPGAD66PresRawPressure( void );
+U16 getFPGAD66PresRawTemperature( void );
 
-U08 getFPGAPDsReadCount( void );
-U08 getFPGAPDsErrorCount( void );
-U16 getFPGAPDsRawPressure( void );
-U16 getFPGAPDsRawTemperature( void );
+U08 getFPGAD51PresReadCount( void );
+U08 getFPGAD51PresErrorCount( void );
+U16 getFPGAD51PresRawPressure( void );
+U16 getFPGAD51PresRawTemperature( void );
 
-U08 getFPGAPDfReadCount( void );
-U08 getFPGAPDfErrorCount( void );
-U16 getFPGAPDfRawPressure( void );
-U16 getFPGAPDfRawTemperature( void );
+U08 getFPGAD18PresReadCount( void );
+U08 getFPGAD18PresErrorCount( void );
+U16 getFPGAD18PresRawPressure( void );
+U16 getFPGAD18PresRawTemperature( void );
 
-U08 getFPGAPtmReadCount( void );
-U08 getFPGAPtmErrorCount( void );
-U16 getFPGAPtmRawPressure( void );
-U16 getFPGAPtmRawTemperature( void );
+U08 getFPGAD41PresReadCount( void );
+U08 getFPGAD41PresErrorCount( void );
+U16 getFPGAD41PresRawPressure( void );
+U16 getFPGAD41PresRawTemperature( void );
 
-U08 getFPGAPRiReadCount( void );
-U08 getFPGAPRiErrorCount( void );
-U16 getFPGAPRiRawPressure( void );
-U16 getFPGAPRiRawTemperature( void );
+U08 getFPGAM1PresReadCount( void );
+U08 getFPGAM1PresErrorCount( void );
+U16 getFPGAM1PresRawPressure( void );
+U16 getFPGAM1PresRawTemperature( void );
 
-U08 getFPGAPRoReadCount( void );
-U08 getFPGAPRoErrorCount( void );
-U16 getFPGAPRoRawPressure( void );
-U16 getFPGAPRoRawTemperature( void );
+U08 getFPGAM3PresReadCount( void );
+U08 getFPGAM3PresErrorCount( void );
+U16 getFPGAM3PresRawPressure( void );
+U16 getFPGAM3PresRawTemperature( void );
 
 //Level sensor
-U16  getFPGALevelSensor1( void );
-U16  getFPGALevelSensor2( void );
-BOOL getFPGAFloater1Status( void );
+U16  getFPGAD63LevelSensor( void );
+U16  getFPGAD46LevelSensor( void );
+BOOL getFPGAD6LevelStatus( void );
 U08  getFPGAFloater2Status( void );
 
 //Temperature sensors
-U32 getFPGAInletHeatExchangerTemp( void );
-U32 getFPGAOutletHeatExchangerTemp( void );
-U32 getFPGAHydraulicsPrimaryHeaterTemp( void );
-U32 getFPGATrimmerHeaterTemp( void );
+U32 getFPGAD1Temp( void );
+U32 getFPGAX6Temp( void );
+U32 getFPGAD4Temp( void );
+U32 getFPGAD50Temp( void );
 U08 getFPGARTDReadCount( void );
+U08 getFPGARTDCountErrorCycles( void );
 
 //Barometric sensor
 U08 getFPGABaroReadCount( void );
@@ -217,8 +222,9 @@
 U32 getFPGABaroTemperature( void );
 
 //Primary and Trimmer heater
-void setFPGAPrimaryHeaterPWMControl( U08 control );
-void setFPGATrimmerHeaterPWMControl( U08 control );
+void setFPGAD5HeaterPWMControl( U08 control );
+void setFPGAD45HeaterPWMControl( U08 control );
+void setFPGAD5HeaterOnOffControl( BOOL flag );
 
 /**@}*/