Index: NVDataMgmt.c
===================================================================
diff -u -r7ec006c5de3450610fd93dc92f1e1b2256109f8d -re1706016ddf7eaf6cd1292514cce517bd625c56b
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 7ec006c5de3450610fd93dc92f1e1b2256109f8d)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision e1706016ddf7eaf6cd1292514cce517bd625c56b)
@@ -157,9 +157,7 @@
 #define DEFAULT_BIC_TEST_ACID_SNSR_US_PER_CM 0.0F                                                               ///< Bicarb test acid sensor conductivity uS/cm.
 #define DEFAULT_BIC_TEST_BIC_SNSR_US_PER_CM  3890.0F                                                            ///< Bicarb test bicarb sensor conductivity uS/cm.
 
-#define DEFAULT_COND_SENSOR_TEMP_COMP_GAIN   1.0F                                                               ///< Conductivity sensor temperature compensation gain.
 #define DEFAULT_COND_SENSOR_TEMP_COMP_COEEF  0.0207F                                                            ///< Conductivity sensor temperature compensation coefficient.
-#define DEFAULT_COND_SENSOR_TEMP_COMP_OFFSET 0.0F                                                               ///< Conductivity sensor temperature compensation offset.
 #endif
 
 /// NVDataMgmt self-test states enumeration.
@@ -3651,9 +3649,9 @@
     if ( calcCRC != recordCRC )
     {
         // CRC did not pass so set all values to default
-        record->gain            = DEFAULT_COND_SENSOR_TEMP_COMP_GAIN;
+        record->gain            = RECORD_DEFAULT_GAIN;
         record->coefficient     = DEFAULT_COND_SENSOR_TEMP_COMP_COEEF;
-        record->offset          = DEFAULT_COND_SENSOR_TEMP_COMP_OFFSET;
+        record->offset          = RECORD_DEFAULT_OFFSET;
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof(DG_COND_SENSOR_TEMP_COMP_CAL_PAYLOAD_T) - sizeof(U16) );