Index: firmware/App/Drivers/ConductivitySensors.h
===================================================================
diff -u -r8a7e671214ef3f742677f6de58b2b0ea86e8fe5c -rb91d956a773bcf1319f816f36b270b31c68948de
--- firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 8a7e671214ef3f742677f6de58b2b0ea86e8fe5c)
+++ firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision b91d956a773bcf1319f816f36b270b31c68948de)
@@ -36,7 +36,7 @@
  */
 
 // ********** public definitions **********
-#define CONDUCTIVITY_CAL_CHAR_LENGTH            10
+#define CONDUCTIVITY_CAL_CHAR_LENGTH            12
 
 /// Enumeration of conductivity sensors.
 typedef enum ConductivitySensors
@@ -90,18 +90,18 @@
 } CONDUCTIVITY_CAL_IDX_T;
 
 typedef struct {
-    U32 K_high;                                         ///< (cell coefficient, high range), default = 4, range = [3, 6]
+    F32 K_high;                                         ///< (cell coefficient, high range), default = 4, range = [3, 6]
     F32 alpha_high;                                     ///< (temperature correction, high range), default = 0.02, range = [0.005, 0.04]
     F32 eta_high;                                       ///< (resistance scale factor, high range), default = 1, range = [0.5, 3]
-    S32 zeta_high;                                      ///< (resistance offset, high range), default = 0, range = [-1000, 1000]
-    U32 K_low;                                          ///< (cell coefficient, low range), default = 4, range = [3, 6]
+    F32 zeta_high;                                      ///< (resistance offset, high range), default = 0, range = [-1000, 1000]
+    F32 K_low;                                          ///< (cell coefficient, low range), default = 4, range = [3, 6]
     F32 alpha_low;                                      ///< (temperature correction, low range), default = 0.02, range = [0.005, 0.04]
     F32 eta_low;                                        ///< (resistance scale factor, low range), default = 1, range = [0.5, 3]
-    S32 zeta_low;                                       ///< (resistance offset, low range), default = 0, range = [-1000, 1000]
+    F32 zeta_low;                                       ///< (resistance offset, low range), default = 0, range = [-1000, 1000]
     F32 beta;                                           ///< (Temperature scale factor), default = 1, range = [0.5, 2]
-    S32 delta;                                          ///< (Temperature offset), default = 0, range = [-10, 10]
-    U32 reserved1;                                      ///< Reserved cal slot.
-    U32 reserved2;                                      ///< Reserved cal slot.
+    F32 delta;                                          ///< (Temperature offset), default = 0, range = [-10, 10]
+    F32 reserved1;                                      ///< Reserved cal slot.
+    F32 reserved2;                                      ///< Reserved cal slot.
 } CONDUCTIVITY_COEFFICIENTS_T;
 
 typedef struct