Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -rb91d956a773bcf1319f816f36b270b31c68948de -r79f8b1a11dcc2f05a685ca33ba2a53fc4208fb4b
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision b91d956a773bcf1319f816f36b270b31c68948de)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 79f8b1a11dcc2f05a685ca33ba2a53fc4208fb4b)
@@ -57,7 +57,7 @@
 #define COND_SENSORS_READ_ERR_MAX_CNT                       255                                         ///< Conductivity sensors read and error count max value.
 
 #define COND_TEMP_OFFSET                                    25                                          ///< Temperature offset constant used in RTD calculations.
-#define SIEMENS_TO_MICROSIEMENS_CONVERSION                  1000000                                     ///< Siemens to microSiemens conversion factor.
+#define SIEMENS_TO_MICROSIEMENS_CONVERSION                  1000000.0F                                  ///< Siemens to microSiemens conversion factor.
 
 /// Defined states for the conductivity write transaction.
 typedef enum Conductvity_States
@@ -206,22 +206,22 @@
 void readConductivitySensorData( void )
 {
     // Read raw conductivity
-    currentConductivityReadings[ D17_COND ].data = (F32)getFPGAD17CondData();
-    currentConductivityReadings[ D27_COND ].data = (F32)getFPGAD27CondData();
-    currentConductivityReadings[ D29_COND ].data = (F32)getFPGAD29CondData();
-    currentConductivityReadings[ D43_COND ].data = (F32)getFPGAD43CondData();
-    currentConductivityReadings[ D74_COND ].data = (F32)getFPGAD74CondData();
-    currentConductivityReadings[ P9_COND ].data  = (F32)getFPGAP9CondData();
-    currentConductivityReadings[ P18_COND ].data = (F32)getFPGAP18CondData();
+    currentConductivityReadings[ D17_COND ].data = getFPGAD17CondData();
+    currentConductivityReadings[ D27_COND ].data = getFPGAD27CondData();
+    currentConductivityReadings[ D29_COND ].data = getFPGAD29CondData();
+    currentConductivityReadings[ D43_COND ].data = getFPGAD43CondData();
+    currentConductivityReadings[ D74_COND ].data = getFPGAD74CondData();
+    currentConductivityReadings[ P9_COND ].data  = getFPGAP9CondData();
+    currentConductivityReadings[ P18_COND ].data = getFPGAP18CondData();
 
     // Read temperature associated to conductivity sensor
-    currentTemperatureReadings[ D17_COND ].data = (F32)getFPGAD17CondTemp();
-    currentTemperatureReadings[ D27_COND ].data = (F32)getFPGAD27CondTemp();
-    currentTemperatureReadings[ D29_COND ].data = (F32)getFPGAD29CondTemp();
-    currentTemperatureReadings[ D43_COND ].data = (F32)getFPGAD43CondTemp();
-    currentTemperatureReadings[ D74_COND ].data = (F32)getFPGAD74CondTemp();
-    currentTemperatureReadings[ P9_COND ].data  = (F32)getFPGAP9CondTemp();
-    currentTemperatureReadings[ P18_COND ].data = (F32)getFPGAP18CondTemp();
+    currentTemperatureReadings[ D17_COND ].data = getFPGAD17CondTemp();
+    currentTemperatureReadings[ D27_COND ].data = getFPGAD27CondTemp();
+    currentTemperatureReadings[ D29_COND ].data = getFPGAD29CondTemp();
+    currentTemperatureReadings[ D43_COND ].data = getFPGAD43CondTemp();
+    currentTemperatureReadings[ D74_COND ].data = getFPGAD74CondTemp();
+    currentTemperatureReadings[ P9_COND ].data  = getFPGAP9CondTemp();
+    currentTemperatureReadings[ P18_COND ].data = getFPGAP18CondTemp();
 }
 
 /*********************************************************************//**
@@ -235,21 +235,21 @@
 static void readConductivitySensorReadCounts( void )
 {
     // Update read counters for each conductivity sensor
-    lastConductivityReadCounter[ D17_COND ].data = (U32)getFPGAD17CondReadCount();
-    lastConductivityReadCounter[ D27_COND ].data = (U32)getFPGAD27CondReadCount();
-    lastConductivityReadCounter[ D29_COND ].data = (U32)getFPGAD29CondReadCount();
-    lastConductivityReadCounter[ D43_COND ].data = (U32)getFPGAD43CondReadCount();
-    lastConductivityReadCounter[ D74_COND ].data = (U32)getFPGAD74CondReadCount();
-    lastConductivityReadCounter[ P9_COND ].data  = (U32)getFPGAP9CondReadCount();
-    lastConductivityReadCounter[ P18_COND ].data = (U32)getFPGAP18CondReadCount();
+    lastConductivityReadCounter[ D17_COND ].data = getFPGAD17CondReadCount();
+    lastConductivityReadCounter[ D27_COND ].data = getFPGAD27CondReadCount();
+    lastConductivityReadCounter[ D29_COND ].data = getFPGAD29CondReadCount();
+    lastConductivityReadCounter[ D43_COND ].data = getFPGAD43CondReadCount();
+    lastConductivityReadCounter[ D74_COND ].data = getFPGAD74CondReadCount();
+    lastConductivityReadCounter[ P9_COND ].data  = getFPGAP9CondReadCount();
+    lastConductivityReadCounter[ P18_COND ].data = getFPGAP18CondReadCount();
 
-    lastTemperatureReadCounter[ D17_COND ].data = (U32)getFPGAD17TempReadCount();
-    lastTemperatureReadCounter[ D27_COND ].data = (U32)getFPGAD27TempReadCount();
-    lastTemperatureReadCounter[ D29_COND ].data = (U32)getFPGAD29TempReadCount();
-    lastTemperatureReadCounter[ D43_COND ].data = (U32)getFPGAD43TempReadCount();
-    lastTemperatureReadCounter[ D74_COND ].data = (U32)getFPGAD74TempReadCount();
-    lastTemperatureReadCounter[ P9_COND ].data  = (U32)getFPGAP9TempReadCount();
-    lastTemperatureReadCounter[ P18_COND ].data = (U32)getFPGAP18TempReadCount();
+    lastTemperatureReadCounter[ D17_COND ].data = getFPGAD17TempReadCount();
+    lastTemperatureReadCounter[ D27_COND ].data = getFPGAD27TempReadCount();
+    lastTemperatureReadCounter[ D29_COND ].data = getFPGAD29TempReadCount();
+    lastTemperatureReadCounter[ D43_COND ].data = getFPGAD43TempReadCount();
+    lastTemperatureReadCounter[ D74_COND ].data = getFPGAD74TempReadCount();
+    lastTemperatureReadCounter[ P9_COND ].data  = getFPGAP9TempReadCount();
+    lastTemperatureReadCounter[ P18_COND ].data = getFPGAP18TempReadCount();
 }
 
 /*********************************************************************//**
@@ -263,21 +263,21 @@
 static void readConductivitySensorErrorCounts( void )
 {
     // Update error counters for each conductivity sensor
-    lastConductivityErrorCounter[ D17_COND ].data = (U32)getFPGAD17CondErrorCount();
-    lastConductivityErrorCounter[ D27_COND ].data = (U32)getFPGAD27CondErrorCount();
-    lastConductivityErrorCounter[ D29_COND ].data = (U32)getFPGAD29CondErrorCount();
-    lastConductivityErrorCounter[ D43_COND ].data = (U32)getFPGAD43CondErrorCount();
-    lastConductivityErrorCounter[ D74_COND ].data = (U32)getFPGAD74CondErrorCount();
-    lastConductivityErrorCounter[ P9_COND ].data = (U32)getFPGAP9CondErrorCount();
-    lastConductivityErrorCounter[ P18_COND ].data = (U32)getFPGAP18CondErrorCount();
+    lastConductivityErrorCounter[ D17_COND ].data = getFPGAD17CondErrorCount();
+    lastConductivityErrorCounter[ D27_COND ].data = getFPGAD27CondErrorCount();
+    lastConductivityErrorCounter[ D29_COND ].data = getFPGAD29CondErrorCount();
+    lastConductivityErrorCounter[ D43_COND ].data = getFPGAD43CondErrorCount();
+    lastConductivityErrorCounter[ D74_COND ].data = getFPGAD74CondErrorCount();
+    lastConductivityErrorCounter[ P9_COND ].data = getFPGAP9CondErrorCount();
+    lastConductivityErrorCounter[ P18_COND ].data = getFPGAP18CondErrorCount();
 
-    lastTemperatureErrorCounter[ D17_COND ].data = (U32)getFPGAD17TempErrorCount();
-    lastTemperatureErrorCounter[ D27_COND ].data = (U32)getFPGAD27TempErrorCount();
-    lastTemperatureErrorCounter[ D29_COND ].data = (U32)getFPGAD29TempErrorCount();
-    lastTemperatureErrorCounter[ D43_COND ].data = (U32)getFPGAD43TempErrorCount();
-    lastTemperatureErrorCounter[ D74_COND ].data = (U32)getFPGAD74TempErrorCount();
-    lastTemperatureErrorCounter[ P9_COND ].data = (U32)getFPGAP9TempErrorCount();
-    lastTemperatureErrorCounter[ P18_COND ].data = (U32)getFPGAP18TempErrorCount();
+    lastTemperatureErrorCounter[ D17_COND ].data = getFPGAD17TempErrorCount();
+    lastTemperatureErrorCounter[ D27_COND ].data = getFPGAD27TempErrorCount();
+    lastTemperatureErrorCounter[ D29_COND ].data = getFPGAD29TempErrorCount();
+    lastTemperatureErrorCounter[ D43_COND ].data = getFPGAD43TempErrorCount();
+    lastTemperatureErrorCounter[ D74_COND ].data = getFPGAD74TempErrorCount();
+    lastTemperatureErrorCounter[ P9_COND ].data = getFPGAP9TempErrorCount();
+    lastTemperatureErrorCounter[ P18_COND ].data = getFPGAP18TempErrorCount();
 }
 
 /*********************************************************************//**
@@ -291,21 +291,21 @@
 static void readConductivitySensorCalData( void )
 {
     // Update cal data and counter for each conductivity sensor
-    conductivitySensorStatus[ D17_COND ].calData = (U32)getFPGAD17CondCalData();
-    conductivitySensorStatus[ D27_COND ].calData = (U32)getFPGAD27CondCalData();
-    conductivitySensorStatus[ D29_COND ].calData = (U32)getFPGAD29CondCalData();
-    conductivitySensorStatus[ D43_COND ].calData = (U32)getFPGAD43CondCalData();
-    conductivitySensorStatus[ D74_COND ].calData = (U32)getFPGAD74CondCalData();
-    conductivitySensorStatus[ P9_COND ].calData = (U32)getFPGAP9CondCalData();
-    conductivitySensorStatus[ P18_COND ].calData = (U32)getFPGAP18CondCalData();
+    conductivitySensorStatus[ D17_COND ].calData = getFPGAD17CondCalData();
+    conductivitySensorStatus[ D27_COND ].calData = getFPGAD27CondCalData();
+    conductivitySensorStatus[ D29_COND ].calData = getFPGAD29CondCalData();
+    conductivitySensorStatus[ D43_COND ].calData = getFPGAD43CondCalData();
+    conductivitySensorStatus[ D74_COND ].calData = getFPGAD74CondCalData();
+    conductivitySensorStatus[ P9_COND ].calData = getFPGAP9CondCalData();
+    conductivitySensorStatus[ P18_COND ].calData = getFPGAP18CondCalData();
 
-    conductivitySensorStatus[ D17_COND ].calMemCount = (U32)getFPGAD17CalMemCounter();
-    conductivitySensorStatus[ D27_COND ].calMemCount = (U32)getFPGAD27CalMemCounter();
-    conductivitySensorStatus[ D29_COND ].calMemCount = (U32)getFPGAD29CalMemCounter();
-    conductivitySensorStatus[ D43_COND ].calMemCount = (U32)getFPGAD43CalMemCounter();
-    conductivitySensorStatus[ D74_COND ].calMemCount = (U32)getFPGAD74CalMemCounter();
-    conductivitySensorStatus[ P9_COND ].calMemCount = (U32)getFPGAP9CalMemCounter();
-    conductivitySensorStatus[ P18_COND ].calMemCount = (U32)getFPGAP18CalMemCounter();
+    conductivitySensorStatus[ D17_COND ].calMemCount = getFPGAD17CalMemCounter();
+    conductivitySensorStatus[ D27_COND ].calMemCount = getFPGAD27CalMemCounter();
+    conductivitySensorStatus[ D29_COND ].calMemCount = getFPGAD29CalMemCounter();
+    conductivitySensorStatus[ D43_COND ].calMemCount = getFPGAD43CalMemCounter();
+    conductivitySensorStatus[ D74_COND ].calMemCount = getFPGAD74CalMemCounter();
+    conductivitySensorStatus[ P9_COND ].calMemCount = getFPGAP9CalMemCounter();
+    conductivitySensorStatus[ P18_COND ].calMemCount = getFPGAP18CalMemCounter();
 }
 
 /*********************************************************************//**