Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -rc49f9ed931d60e5bd1d0a406fde6c9fe1437f73b -r7362b089e676aadfaa614cca148e2aed007bae95
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision c49f9ed931d60e5bd1d0a406fde6c9fe1437f73b)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 7362b089e676aadfaa614cca148e2aed007bae95)
@@ -360,18 +360,44 @@
  *************************************************************************/
 static void writeConductivitySensorCalData( CONDUCTIVITY_SENSORS_T sensorId )
 {
-    setFPGACondSensCalData1( conductivityCalRecord[ sensorId ].K_high );
-    setFPGACondSensCalData2( conductivityCalRecord[ sensorId ].alpha_high );
-    setFPGACondSensCalData3( conductivityCalRecord[ sensorId ].eta_high );
-    setFPGACondSensCalData4( conductivityCalRecord[ sensorId ].zeta_high );
-    setFPGACondSensCalData5( conductivityCalRecord[ sensorId ].K_low );
-    setFPGACondSensCalData6( conductivityCalRecord[ sensorId ].alpha_low );
-    setFPGACondSensCalData7( conductivityCalRecord[ sensorId ].eta_low );
-    setFPGACondSensCalData8( conductivityCalRecord[ sensorId ].zeta_low );
-    setFPGACondSensCalData9( conductivityCalRecord[ sensorId ].beta );
-    setFPGACondSensCalData10( conductivityCalRecord[ sensorId ].delta );
-    setFPGACondSensCalData11( conductivityCalRecord[ sensorId ].reserved1 );
-    setFPGACondSensCalData12( conductivityCalRecord[ sensorId ].reserved2 );
+    U32 value;
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].K_high, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].alpha_high, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].eta_high, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].zeta_high, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].K_low, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].alpha_low, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].eta_low, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].zeta_low, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].beta, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].delta, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].reserved1, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
+    memcpy( &value, &conductivityCalRecord[ sensorId ].reserved2, sizeof( F32 ) );
+    setFPGACondSensCalData1( value );
+
     setFPGACondSensCalibrationTime( conductivityCalRecord[ sensorId ].calibrationTime );
     setFPGACondSensCalibrationCRC( conductivityCalRecord[ sensorId ].crc );
     setFPGACondSensorId( sensorId );