Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -r20e605a4be47ee01ffa14e3f5d38ce1513aa166d
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 20e605a4be47ee01ffa14e3f5d38ce1513aa166d)
@@ -44,7 +44,6 @@
 #define COND_CPO_SENSOR_PROBE_TYPE                      10                                          ///< 0.1 K cell constant conductivity probe.
 
 #define COND_SENSOR_DECIMAL_CONVERSION                  100.0F                                      ///< Conductivity value from FPGA has two decimal place.
-#define COND_SENSOR_TEMPERATURE_COEF                    0.02F                                       ///< Linear temperature coefficient of variation at 25 Celcius for fresh water.
 #define COND_SENSOR_REFERENCE_TEMPERATURE               25.0F                                       ///< Reference temperature for conductivity sensor.
 #define COND_SENSOR_REPORT_PERIOD                       ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )  ///< Broadcast conductivity values message every second.
 
@@ -145,11 +144,12 @@
 static EMSTAT_READ_T emstatBoardRead[ NUM_OF_EMSTAT_BOARDS ];                                       ///< EMSTAT board read.
 static COND_SENSOR_STATUS_T condSensorStatus[ NUM_OF_CONDUCTIVITY_SENSORS ];                        ///< Conductivity sensors status.
 static DG_COND_SENSORS_CAL_RECORD_T condSensorsCalRecord;                                           ///< Conductivity sensors' calibration record.
+static DG_COND_SENSORS_TEMP_COMP_CAL_RECORD_T condSensorsTempCompCalRecord;                         ///< Conductivity sensors' temperature compensation calibration record.
 static CAL_DATA_DG_COND_SENSORS_T condSensorCalTable[ NUM_OF_CONDUCTIVITY_SENSORS ];                ///< Conductivity sensors calibration table.
 
 // ********** private function prototypes **********
 
-static F32 calcCompensatedConductivity( F32 conductivity, F32 temperature );
+static F32 calcCompensatedConductivity( U32 sensorID, F32 conductivity, F32 temperature );
 static void calcRORejectionRatio( void );
 static void processCPiCPoSensorRead( U32 sensorId, U08 emstatBoardSensorIndex, U32 fgpaRead, U08 fpgaReadCount, U08 fpgaErrorCount, U08 fpgaSensorFault );
 
@@ -307,10 +307,16 @@
  *************************************************************************/
 SELF_TEST_STATUS_T execConductivitySensorsSelfTest( void )
 {
-    BOOL calStatus            = getNVRecord2Driver( GET_CAL_CONDUCTIVITY_SENSORS, (U08*)&condSensorsCalRecord, sizeof( condSensorsCalRecord ),
-                                                    NUM_OF_CAL_DATA_COND_SENSORS, ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD );
-    SELF_TEST_STATUS_T result = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED );
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
+    BOOL calStatus            = FALSE;
 
+    calStatus |= getNVRecord2Driver( GET_CAL_CONDUCTIVITY_SENSORS, (U08*)&condSensorsCalRecord, sizeof( DG_COND_SENSORS_CAL_RECORD_T ),
+                                     NUM_OF_CAL_DATA_COND_SENSORS, ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD );
+    calStatus |= getNVRecord2Driver( GET_CAL_CONDUCTIVITY_SENSORS_TEMP_COMP, (U08*)&condSensorsTempCompCalRecord, sizeof( DG_COND_SENSORS_TEMP_COMP_CAL_RECORD_T ),
+                                     NUM_OF_CAL_DATA_COND_SENSORS_TEMP_COMP, ALARM_ID_DG_COND_SENSORS_INVALID_TEMP_COMP_CAL_RECORD );
+
+    result = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED );
+
     return result;
 }
 
@@ -472,14 +478,19 @@
  * reference temperature of 25 degree Celsius.
  * @details Inputs: conductivity, temperature
  * @details Outputs: none
+ * @param sensorID the ID of the conductivity sensor
  * @param conductivity conductivity value
  * @param temperature temperature to compensate conductivity with
  * @return compensated conductivity based on temperature
  *************************************************************************/
-static F32 calcCompensatedConductivity( F32 conductivity, F32 temperature )
+static F32 calcCompensatedConductivity( U32 sensorID, F32 conductivity, F32 temperature )
 {
-    // EC = EC_25 * (1 + temp_coef * ( temperature - 25 ))
-    F32 compensatedCoef = ( 1.0F + ( COND_SENSOR_TEMPERATURE_COEF * ( temperature - COND_SENSOR_REFERENCE_TEMPERATURE ) ) );
+    F32 gain            = condSensorsTempCompCalRecord.condSensorsTempComp[ (CAL_DATA_DG_COND_SENSORS_COMP_T)sensorID ].gain;
+    F32 coeff           = condSensorsTempCompCalRecord.condSensorsTempComp[ (CAL_DATA_DG_COND_SENSORS_COMP_T)sensorID ].coefficient;
+    F32 offset          = condSensorsTempCompCalRecord.condSensorsTempComp[ (CAL_DATA_DG_COND_SENSORS_COMP_T)sensorID ].offset;
+    F32 compensation    = ( gain * coeff ) + offset;
+    // EC = EC_25 * (1 + compensation * ( temperature - 25 ))
+    F32 compensatedCoef = ( 1.0F + ( compensation * ( temperature - COND_SENSOR_REFERENCE_TEMPERATURE ) ) );
 
     return conductivity / compensatedCoef;
 }
@@ -530,7 +541,7 @@
             // EMSTAT sensors will be the permanent sensors from DVT onward.
             F32 temperature     = getTemperatureValue( emstatBoardRead[ EMSTAT_CPI_CPO_BOARD ].sensors[ emstatBoardSensorIndex ].condSnsrTempSnsr );
             F32 conductivity    = ( (F32)( fgpaRead ) / COND_SENSOR_DECIMAL_CONVERSION );
-            F32 compensatedCond = calcCompensatedConductivity( conductivity, temperature );
+            F32 compensatedCond = calcCompensatedConductivity( sensorId, conductivity, temperature );
 
             condSensorStatus[ sensorId ].readCount                 = fpgaReadCount;
             condSensorStatus[ sensorId ].internalErrorCount        = 0;
@@ -715,7 +726,7 @@
         F32 resistance      = ( ( F32 )( condSensorStatus[ sensorId ].rawEmstatCondValue - EMSTAT_PICO_MEASUREMENT_OFFSET ) / prefix );
         F32 temperature     = getTemperatureValue( readPackage->sensors[ boardSensorIndex ].condSnsrTempSnsr );
         F32 conductivity    = ( 1.0F / resistance ) * SIEMENS_TO_MICROSIEMENS_CONVERSION;
-        F32 compensatedCond = calcCompensatedConductivity( conductivity, temperature );
+        F32 compensatedCond = calcCompensatedConductivity( sensorId, conductivity, temperature );
 
         condSensorStatus[ sensorId ].internalErrorCount        = 0;
         condSensorStatus[ sensorId ].compensatedCondValue.data = getCalibrationAppliedConductivityValue( sensorId, compensatedCond );