Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r0f6a7299b2382daf3a3dd62446b0e8467f17bddb -r5ed781a9474910ff9db65e4ef0ab995e03e312fa
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 0f6a7299b2382daf3a3dd62446b0e8467f17bddb)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 5ed781a9474910ff9db65e4ef0ab995e03e312fa)
@@ -34,26 +34,19 @@
 #define MAX_TOP_LEVEL_PN_CHARS 10U                                                                             ///< Max number of characters for top level part number.
 #define MAX_TOP_LEVEL_SN_CHARS 15U                                                                             ///< Max number of characters for top level serial number.
 
-// TODO this might need to be removed
-typedef enum build_switches
+/// Software configuration enums
+typedef enum software_configurations
 {
-    // Anything else other than build switches name?
-    BUILD_SWITCH_IGNORE_HEATERS_MONITOR = 0,
-    BUILD_SWITCH_THD_USING_TRO_CONNECTOR,
-    BUILD_SWITCH_DISABLE_ALL_SWITHCES,
-    NUM_OF_BUILD_SWITCHES
-} BUILD_SWITHCES_T;
+    SW_CONFIG_DISABLE_HEATERS_MONITOR = 0,                                                                     ///< Software configuration disable heaters monitor.
+    SW_CONFIG_THD_USING_TRO_CONNECTOR,                                                                         ///< Software configuration THD using TRO temperature sensor.
+    SW_CONFIG_DISABLE_CAL_CHECK,                                                                               ///< Software configuration disable calibration check.
+    SW_CONFIG_ALARMS_DEBUG,                                                                                    ///< Software configuration alarms debug.
+    SW_CONFIG_DISABLE_RO_PUMP_MONITOR,                                                                         ///< Software configuration disable RO pump monitor.
+    SW_CONFIG_DISABLE_RO_RATIO_CHECK,                                                                          ///< Software configuration disable RO ratio check
+    SW_CONFIG_DISABLE_COND_SENSOR_CHECK,                                                                       ///< Software configuration disable conductivity sensor check.
+    NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
+} SOFTWARE_CONFIG_T;
 
-// This function only returns a 1 or a 0.
-//U08 getSwitchStatus( BUILD_SWITHCES_T switchName );
-
-typedef struct
-{
-    U08 switchesList[ NUM_OF_BUILD_SWITCHES ];
-    U16 crc;
-} STUFF_STUFF_T;
-// TODO this might need to be removed
-
 /// DG available NV data to get
 typedef enum dg_nv_commands
 {
@@ -66,6 +59,8 @@
     GET_CAL_CONDUCTIVITY_SENSORS,                                                                              ///< Get conductivity sensors calibration data.
     GET_CAL_TEMP_SENSORS,                                                                                      ///< Get temperature sensors calibration data.
     GET_CAL_RSRVRS_VOL_RECORD,                                                                                 ///< Get reservoirs volume record.
+    GET_CAL_HEATING_RECORD,                                                                                    ///< Get heating calibration record.
+    GET_CAL_DRAIN_LINE_VOLUME_RECORD,                                                                          ///< Get drain line volume record.
     GET_INF_HEATERS_RECORD,                                                                                    ///< Get heaters information form the the last run.
     GET_SYS_RECORD,                                                                                            ///< Get system record.
     GET_SRV_RECORD,                                                                                            ///< Get service record.