Index: firmware/App/Drivers/ConductivitySensors.h
===================================================================
diff -u -rac72b3fa86015b2c60c7687a4597dd4ae5c24dc8 -r83bae6ae5f7f26a3511d1d6965310fd8ac9ad496
--- firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision ac72b3fa86015b2c60c7687a4597dd4ae5c24dc8)
+++ firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 83bae6ae5f7f26a3511d1d6965310fd8ac9ad496)
@@ -55,7 +55,9 @@
     CAL_DATA_10,                                        ///< Cal Data 10. Temperature scale factor
     CAL_DATA_11,                                        ///< Cal Data 11. Reserved.
     CAL_DATA_12,                                        ///< Cal Data 12. Reserved
-    LAST_CAL_DATA = CAL_DATA_12,                        ///< Last index of calibration data
+    CAL_DATA_13,                                        ///< Cal Data 13. Calibration time
+    CAL_DATA_14,                                        ///< Cal Data 14. CRC
+    LAST_CAL_DATA = CAL_DATA_14,                        ///< Last index of calibration data
     SW_REV_LOWER_WORD,                                  ///< SW Revision. 3 - 0 bytes
     FIRST_SW_REV = SW_REV_LOWER_WORD,                   ///< First index of SW revision
     SW_REV_MID_WORD,                                    ///< SW Revision. 7 - 4 bytes
@@ -124,8 +126,9 @@
 F32 getConductivityRawRTD( CONDUCTIVITY_SENSORS_T sensor );
 F32 getUncompensatedConductivity( CONDUCTIVITY_SENSORS_T sensor );
 
-CONDUCTIVITY_COEFFICIENTS_T* getConductivityCalibrationData( void );
-void setConductivityCalibrationData( CONDUCTIVITY_COEFFICIENTS_T* record);
+CONDUCTIVITY_COEFFICIENTS_T getConductivityCalibrationData( CONDUCTIVITY_SENSORS_T sensorIdx );
+BOOL setConductivityCalibrationData( CONDUCTIVITY_SENSORS_T sensorIdx,
+                                     CONDUCTIVITY_COEFFICIENTS_T record);
 
 BOOL testConductivitySensorConductivityReadingsOverride( MESSAGE_T *message );
 BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );