Index: firmware/App/Services/FpgaDD.h
===================================================================
diff -u -r33090b2328de68d9b94e95feeb5307d8fdc66b97 -r79f8b1a11dcc2f05a685ca33ba2a53fc4208fb4b
--- firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision 33090b2328de68d9b94e95feeb5307d8fdc66b97)
+++ firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision 79f8b1a11dcc2f05a685ca33ba2a53fc4208fb4b)
@@ -82,65 +82,55 @@
 void setFPGAValveSPPWMPeriod( U16 valvePWMPeriod );
 
 // Conductivity and Temperature Sensor
-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 );
-
 U08 getFPGAD17CondReadCount( void );
 U08 getFPGAD17CondErrorCount( void );
 U08 getFPGAD17TempReadCount( void );
 U08 getFPGAD17TempErrorCount( void );
-U32 getFPGAD17CondData( void );
-U32 getFPGAD17CondTemp( void );
+F32 getFPGAD17CondData( void );
+F32 getFPGAD17CondTemp( void );
 U32 getFPGAD17CondCalData( void );
 U08 getFPGAD17CalMemCounter( void );
 
 U08 getFPGAD27CondReadCount( void );
 U08 getFPGAD27CondErrorCount( void );
 U08 getFPGAD27TempReadCount( void );
 U08 getFPGAD27TempErrorCount( void );
-U32 getFPGAD27CondData( void );
-U32 getFPGAD27CondTemp( void );
+F32 getFPGAD27CondData( void );
+F32 getFPGAD27CondTemp( void );
 U32 getFPGAD27CondCalData( void );
 U08 getFPGAD27CalMemCounter( void );
 
 U08 getFPGAD29CondReadCount( void );
 U08 getFPGAD29CondErrorCount( void );
 U08 getFPGAD29TempReadCount( void );
 U08 getFPGAD29TempErrorCount( void );
-U32 getFPGAD29CondData( void );
-U32 getFPGAD29CondTemp( void );
+F32 getFPGAD29CondData( void );
+F32 getFPGAD29CondTemp( void );
 U32 getFPGAD29CondCalData( void );
 U08 getFPGAD29CalMemCounter( void );
 
 U08 getFPGAD43CondReadCount( void );
 U08 getFPGAD43CondErrorCount( void );
 U08 getFPGAD43TempReadCount( void );
 U08 getFPGAD43TempErrorCount( void );
-U32 getFPGAD43CondData( void );
-U32 getFPGAD43CondTemp( void );
+F32 getFPGAD43CondData( void );
+F32 getFPGAD43CondTemp( void );
 U32 getFPGAD43CondCalData( void );
 U08 getFPGAD43CalMemCounter( void );
 
 U08 getFPGAD74CondReadCount( void );
 U08 getFPGAD74CondErrorCount( void );
 U08 getFPGAD74TempReadCount( void );
 U08 getFPGAD74TempErrorCount( void );
-U32 getFPGAD74CondData( void );
-U32 getFPGAD74CondTemp( void );
+F32 getFPGAD74CondData( void );
+F32 getFPGAD74CondTemp( void );
 U32 getFPGAD74CondCalData( void );
 U08 getFPGAD74CalMemCounter( void );
 
 // Pumps  (Dosing and Gear pumps )
-void setFPGAD11PumpSetStepSpeed( U16 stepSpeed );
-void setFPGAD10PumpSetStepSpeed( U16 stepSpeed );
-void setFPGAD76PumpSetStepSpeed( U16 stepSpeed );
+void setFPGAD11PumpSetStepSpeed( U32 stepSpeed );
+void setFPGAD10PumpSetStepSpeed( U32 stepSpeed );
+void setFPGAD76PumpSetStepSpeed( U32 stepSpeed );
 void setFPGAD11PumpControl( U08 control );
 void setFPGAD10PumpControl( U08 control );
 void setFPGAD76PumpControl( U08 control );
@@ -162,9 +152,9 @@
 BOOL getFPGAD10PumpIsParked( void );
 BOOL getFPGAD11PumpParkFault( void );
 BOOL getFPGAD10PumpParkFault( void );
-U16 getFPGAD11PumpHallSensePulseWidth( void );
-U16 getFPGAD10PumpHallSensePulseWidth( void );
-U16 getFPGAD76PumpHallSensePulseWidth( void );
+U32 getFPGAD11PumpHallSensePulseWidth( void );
+U32 getFPGAD10PumpHallSensePulseWidth( void );
+U32 getFPGAD76PumpHallSensePulseWidth( void );
 U16 getFPGAD11PumpRevolutionCountStatus( void );
 U16 getFPGAD10PumpRevolutionCountStatus( void );
 U16 getFPGAD76PumpRevolutionCountStatus( void );
@@ -304,22 +294,29 @@
 U08  getFPGAFlowP16ReadCount( void );
 U08  getFPGAFlowP16ErrorCount( 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 );
+
 // Conductivity
 U08 getFPGAP9CondReadCount( void );
 U08 getFPGAP9CondErrorCount( void );
 U08 getFPGAP9TempReadCount( void );
 U08 getFPGAP9TempErrorCount( void );
-U32 getFPGAP9CondData( void );
-U32 getFPGAP9CondTemp( void );
+F32 getFPGAP9CondData( void );
+F32 getFPGAP9CondTemp( void );
 U32 getFPGAP9CondCalData( void );
 U08 getFPGAP9CalMemCounter( void );
 
 U08 getFPGAP18CondReadCount( void );
 U08 getFPGAP18CondErrorCount( void );
 U08 getFPGAP18TempReadCount( void );
 U08 getFPGAP18TempErrorCount( void );
-U32 getFPGAP18CondData( void );
-U32 getFPGAP18CondTemp( void );
+F32 getFPGAP18CondData( void );
+F32 getFPGAP18CondTemp( void );
 U32 getFPGAP18CondCalData( void );
 U08 getFPGAP18CalMemCounter( void );