Index: firmware/App/Controllers/ConductivitySensors.h
===================================================================
diff -u -rc4f3105da2ed8a7c40950588b54b79067185a3ad -rfe738f3cd0fb9a3ab1ea52e202543ab7bde56825
--- firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision c4f3105da2ed8a7c40950588b54b79067185a3ad)
+++ firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision fe738f3cd0fb9a3ab1ea52e202543ab7bde56825)
@@ -52,31 +52,38 @@
 /// Enumeration of conductivity sensors.
 typedef enum ConductivitySensors
 {
-    CONDUCTIVITYSENSORS_CPI_SENSOR = 0,     ///< Inlet water conductivity sensor
-    CONDUCTIVITYSENSORS_CPO_SENSOR,         ///< Outlet water conductivity sensor
-    CONDUCTIVITYSENSORS_CD1_SENSOR,         ///< Post-acid concentrate conductivity sensor
-    CONDUCTIVITYSENSORS_CD2_SENSOR,         ///< Post-bicarbonate concentrate conductivity sensor
-    NUM_OF_CONDUCTIVITY_SENSORS             ///< Number of conductivity sensors
+    CONDUCTIVITYSENSORS_CPI_SENSOR = 0,                   ///< Inlet water conductivity sensor
+    CONDUCTIVITYSENSORS_CPO_SENSOR,                       ///< Outlet water conductivity sensor
+    CONDUCTIVITYSENSORS_CD1_SENSOR,                       ///< Post-acid concentrate conductivity sensor
+    CONDUCTIVITYSENSORS_CD2_SENSOR,                       ///< Post-bicarbonate concentrate conductivity sensor
+    NUM_OF_CONDUCTIVITY_SENSORS                           ///< Number of conductivity sensors
 } CONDUCTIVITY_SENSORS_T;
 
 /// Conductivity data struct.
 typedef struct
 {
-    F32 roRejectionRatio;                   ///< RO rejection ratio
-    F32 cpi;                                ///< CPi conductivity sensor value
-    F32 cpo;                                ///< CPo conductivity sensor value
-    F32 cd1;                                ///< CD1 conductivity sensor value
-    F32 cd2;                                ///< CD2 conductivity sensor value
-    F32 cpiRaw;                             ///< CPi raw conductivity sensor value (without 2% temperature compensated)
-    F32 cpoRaw;                             ///< CPo raw conductivity sensor value (without 2% temperature compensated)
-    F32 cd1Raw;                             ///< CD1 raw conductivity sensor value (without 2% temperature compensated)
-    F32 cd2Raw;                             ///< CD2 raw conductivity sensor value (without 2% temperature compensated)
-    U32 cpiSensorStatus;                    ///< CPi conductivity sensor status
-    U32 cpoSensorStatus;                    ///< CPo conductivity sensor status
-    U32 cd1SensorStatus;                    ///< CD1 conductivity sensor status
-    U32 cd2SensorStatus;                    ///< CD2 conductivity sensor status
+    F32 roRejectionRatio;                                 ///< RO rejection ratio
+    F32 cpi;                                              ///< CPi conductivity sensor value
+    F32 cpo;                                              ///< CPo conductivity sensor value
+    F32 cd1;                                              ///< CD1 conductivity sensor value
+    F32 cd2;                                              ///< CD2 conductivity sensor value
+    F32 cpiRaw;                                           ///< CPi raw conductivity sensor value (without 2% temperature compensated)
+    F32 cpoRaw;                                           ///< CPo raw conductivity sensor value (without 2% temperature compensated)
+    F32 cd1Raw;                                           ///< CD1 raw conductivity sensor value (without 2% temperature compensated)
+    F32 cd2Raw;                                           ///< CD2 raw conductivity sensor value (without 2% temperature compensated)
+    U32 cpiSensorStatus;                                  ///< CPi conductivity sensor status
+    U32 cpoSensorStatus;                                  ///< CPo conductivity sensor status
+    U32 cd1SensorStatus;                                  ///< CD1 conductivity sensor status
+    U32 cd2SensorStatus;                                  ///< CD2 conductivity sensor status
 } CONDUCTIVITY_DATA_T;
 
+/// Conductivity sensor calibration table selection structure
+typedef struct
+{
+    U32 sensorId;                                         ///< Sensor ID.
+    U32 calTableId;                                       ///< Calibration table ID.
+} CONDUCTIVITY_SENSOR_CAL_TABLE_T;
+
 // ********** public function prototypes **********
 
 void initConductivitySensors( void );
@@ -98,6 +105,7 @@
 
 BOOL testSetConductivityDataPublishIntervalOverride( U32 interval_ms );
 BOOL testResetConductivityDataPublishIntervalOverride( void );
+BOOL testSetConductivitySensorCalibrationTable( CONDUCTIVITY_SENSOR_CAL_TABLE_T* data );
 
 /**@}*/