Index: NVDataMgmt.c
===================================================================
diff -u -rc4171147708d867ba5886aaa53182ad0fae774d3 -r7e186bb97310fb59f525e5399ec7a74711bea571
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision c4171147708d867ba5886aaa53182ad0fae774d3)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 7e186bb97310fb59f525e5399ec7a74711bea571)
@@ -129,13 +129,14 @@
 // DG specific defines
 #ifdef _DG_
 #define FLUSH_LINES_DEFAULT_VOLUME_L              0.01F                                                         ///< Water volume to flush when starting re-circulate mode in liters.
-#define ACID_CONC_DEFAULT_MIXING_RATIO            ( 2.35618 / FRACTION_TO_PERCENT_FACTOR )                      ///< Ratio between RO water and acid concentrate mixing ratio.
 #define BICARB_CONC_DEFAULT_MIXING_RATIO          ( 4.06812 / FRACTION_TO_PERCENT_FACTOR )                      ///< Ratio between RO water and bicarbonate concentrate mixing ratio.
-#define PRES_SENSORS_RESERVED_SPACE_COUNT         6                                                             ///< Pressure sensors reserved space count.
-#define FLOW_SENSROS_RESERVED_SPACE_COUNT         2                                                             ///< Flow sensors reserved space count.
-#define TEMP_SENSORS_RESERVED_SPACE_COUNT         5                                                             ///< Temperature sensors reserved space count.
-#define COND_SENSORS_RESERVED_SPACE_COUNT         2                                                             ///< Conductivity sensors reserved space count.
-#define GENERIC_VOL_RESERVED_SPACE_COUNT          4                                                             ///< Generic volumes reserved space count.
+#define RECORD_DEFAULT_BICARB_BOTTLE_VOL_ML       3780.0F                                                       ///< Record default bicarb bottle volume in milliliters.
+#define RECORD_DEFAULT_BICARB_COND_US_PER_CM      13734.88F                                                     ///< Record default acid conductivity in uS/cm.
+#define RECORD_DEFAULT_BICARB_BOTTLE_TEMP_C       23.5F                                                         ///< Record default acid bottle temperature in C.
+#define ACID_CONC_DEFAULT_MIXING_RATIO            ( 2.35618 / FRACTION_TO_PERCENT_FACTOR )                      ///< Ratio between RO water and acid concentrate mixing ratio.
+#define RECORD_DEFAULT_ACID_BOTTLE_VOL_ML         3430.0F                                                       ///< Record default acid bottle volume in milliliters.
+#define RECORD_DEFAULT_ACID_COND_US_PER_CM        11645.05F                                                     ///< Record default acid conductivity in uS/cm.
+#define RECORD_DEFAULT_ACID_BOTTLE_TEMP_C         23.5F                                                         ///< Record default acid bottle temperature in C.
 #define RESERVOIR_TEMPERATURE_TAU_C_PER_MIN      -0.512F                                                        ///< Reservoir temperature time constant C/min.
 #define ULTRAFILTER_TEMPERATURE_TAU_C_PER_MIN    -4.565F                                                        ///< Ultrafilter temperature time constant C/min.
 #define ULTRAFILTER_VOLUME_ML                     700                                                           ///< Ultrafilter volume in milliliters.
@@ -3590,20 +3591,19 @@
 static BOOL isDGAcidConcentrateRecordValid( DG_ACID_CONCENTRATE_T* record )
 {
     BOOL status   = TRUE;
-    U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_ACID_CONCENTRATE_T) - sizeof(U16) );
+    U16 calcCRC   = crc16 ( (U08*)record, sizeof( DG_ACID_CONCENTRATE_T ) - sizeof( U16 ) );
     U16 recordCRC = record->crc;
 
     if ( calcCRC != recordCRC )
     {
         // CRC did not pass so set all values to default
-        record->startVolume      = RECORD_DEFAULT_CONST;
-        record->reserverdSpace   = RECORD_DEFAULT_CONST;
-        record->acidConcMixRatio = ACID_CONC_DEFAULT_MIXING_RATIO;
-        record->calibrationTime  = RECORD_DEFAULT_TIME;
-        record->crc              = crc16 ( (U08*)record, sizeof(DG_ACID_CONCENTRATE_T) - sizeof(U16) );
-
-        // Set the to FALSE since the record is not valid
-        status = FALSE;
+        record->acidFullBottleVolumeML  = RECORD_DEFAULT_ACID_BOTTLE_VOL_ML;
+        record->acidConductivityUSPerCM = RECORD_DEFAULT_ACID_COND_US_PER_CM;
+        record->acidBottleTemperature   = RECORD_DEFAULT_ACID_BOTTLE_TEMP_C;
+        record->acidConcMixRatio        = ACID_CONC_DEFAULT_MIXING_RATIO;
+        record->calibrationTime         = RECORD_DEFAULT_TIME;
+        record->crc                     = crc16 ( (U08*)record, sizeof( DG_ACID_CONCENTRATE_T ) - sizeof( U16 ) );
+        status                          = FALSE;
     }
 
     return status;
@@ -3621,20 +3621,19 @@
 static BOOL isDGBicarbConcentrateRecordValid( DG_BICARB_CONCENTRATE_T* record )
 {
     BOOL status   = TRUE;
-    U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_BICARB_CONCENTRATE_T) - sizeof(U16) );
+    U16 calcCRC   = crc16 ( (U08*)record, sizeof( DG_BICARB_CONCENTRATE_T ) - sizeof( U16 ) );
     U16 recordCRC = record->crc;
 
     if ( calcCRC != recordCRC )
     {
         // CRC did not pass so set all values to default
-        record->startVolume        = RECORD_DEFAULT_CONST;
-        record->reservedSpace      = RECORD_DEFAULT_CONST;
-        record->bicarbConcMixRatio = BICARB_CONC_DEFAULT_MIXING_RATIO;
-        record->calibrationTime    = RECORD_DEFAULT_TIME;
-        record->crc                = crc16 ( (U08*)record, sizeof(DG_BICARB_CONCENTRATE_T) - sizeof(U16) );
-
-        // Set the to FALSE since the record is not valid
-        status = FALSE;
+        record->bicarbStartVolumeML       = RECORD_DEFAULT_BICARB_BOTTLE_VOL_ML;
+        record->bicarbConductivityUSPerCM = RECORD_DEFAULT_BICARB_COND_US_PER_CM;
+        record->bicarbBottleTemperature   = RECORD_DEFAULT_BICARB_BOTTLE_TEMP_C;
+        record->bicarbConcMixRatio        = BICARB_CONC_DEFAULT_MIXING_RATIO;
+        record->calibrationTime           = RECORD_DEFAULT_TIME;
+        record->crc                       = crc16 ( (U08*)record, sizeof( DG_BICARB_CONCENTRATE_T ) - sizeof( U16 ) );
+        status                            = FALSE;
     }
 
     return status;