Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r54a9bd09d6714d7faaa186959988a75ef3b83557 -r7d3731085a0c0a51daf7733236461f4f56a1126a
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 54a9bd09d6714d7faaa186959988a75ef3b83557)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 7d3731085a0c0a51daf7733236461f4f56a1126a)
@@ -34,6 +34,21 @@
 #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.
 
+#ifndef _RELEASE_
+/// Software configuration enums
+typedef enum software_configurations
+{
+    SW_CONFIG_DISABLE_HEATERS_MONITOR = 0,                                                                     ///< Software configuration disable heaters monitor.
+    SW_CONFIG_ENABLE_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;
+#endif
+
 /// DG available NV data to get
 typedef enum dg_nv_commands
 {
@@ -42,8 +57,19 @@
     GET_CAL_FLOW_SENSORS,                                                                                      ///< Get flow sensors calibration data.
     GET_CAL_ACID_CONCENTREATES,                                                                                ///< Get acid concentrates calibration data.
     GET_CAL_BICARB_CONCENTRATES,                                                                               ///< Get bicarb concentrates calibration data.
+    GET_CAL_ACCEL_SENSORS,                                                                                     ///< Get accelerometers calibration data.
+    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_CAL_RO_PUMP_RECORD,                                                                                    ///< Get RO pump calibration record.
+    GET_CAL_CONCENTRATE_PUMPS_RECORD,                                                                          ///< Get concentrate pumps calibration record.
+    GET_CAL_DRAIN_PUMP_RECORD,                                                                                 ///< Get drain pump calibration record.
+    GET_CAL_FANS_RECORD,                                                                                       ///< Get fans calibration record.
+    GET_CAL_PRE_RO_PURGE_VOLUME_RECORD,                                                                        ///< Get pre RO purge volume record.
+    GET_CAL_FILTERS_RECORD,                                                                                    ///< Get filters record.
     GET_INF_HEATERS_RECORD,                                                                                    ///< Get heaters information form the the last run.
-    GET_MFG_RECORD,                                                                                            ///< Get manufacturing record.
     GET_SYS_RECORD,                                                                                            ///< Get system record.
     GET_SRV_RECORD,                                                                                            ///< Get service record.
     GET_SRR_RECORD,                                                                                            ///< Get scheduled runs record.
@@ -147,6 +173,18 @@
     NUM_OF_CAL_DATA_BICARB_CONCENTRATES                                                                         ///< Number of bicarb concentrates.
 } CAL_DATA_DG_BICARB_CONCENTRATES_T;
 
+/// DG fans enumeration.
+typedef enum dg_fans
+{
+    CAL_DATA_INLET_FAN_1 = 0,                                                                                   ///< Inlet fan 1.
+    CAL_DATA_INLET_FAN_2,                                                                                       ///< Inlet fan 2.
+    CAL_DATA_INLET_FAN_3,                                                                                       ///< Inlet fan 3.
+    CAL_DATA_OUTLET_FAN_1,                                                                                      ///< Outlet fan 1.
+    CAL_DATA_OUTLET_FAN_2,                                                                                      ///< Outlet fan 2.
+    CAL_DATA_OUTLET_FAN_3,                                                                                      ///< Outlet fan 3.
+    NUM_OF_CAL_DATA_FANS                                                                                        ///< Number of fans.
+} CAL_DATA_DG_FANS_T;
+
 /// DG scheduled runs enumeration.
 typedef enum dg_scheduled_runs
 {
@@ -356,8 +394,7 @@
 /// DG fans calibration data structure
 typedef struct
 {
-    DG_FAN_CAL_RECORD_T fan1;                                                                                   ///< Fan 1.
-    DG_FAN_CAL_RECORD_T fan2;                                                                                   ///< Fan 2.
+    DG_FAN_CAL_RECORD_T fans[ NUM_OF_CAL_DATA_FANS ];                                                           ///< Fans calibration record.
 } DG_FANS_CAL_RECORD_T;
 
 /// HD accelerometer sensor calibration record
@@ -370,6 +407,16 @@
     U16 crc;                                                                                                    ///< CRC for the DG accelerometer sensor.
 } DG_ACCEL_SENSOR_CAL_RECORD_T;
 
+/// DG heating calibration record
+typedef struct
+{
+    F32 reservoirTempTauCPerMin;                                                                                ///< Reservoir temperature Tau C/min.
+    F32 ultrafilterTempTauCPerMin;                                                                              ///< Ultrafilter temperature Tau C/min.
+    U32 ultrafilterVolmL;                                                                                       ///< Ultrafilter volume in mL.
+    U32 calibrationTime;                                                                                        ///< Calibration time.
+    U16 crc;                                                                                                    ///< CRC for the reservoirs and UF record.
+} DG_HEATING_CAL_RECORD_T;
+
 /// DG systems record structure
 typedef struct
 {
@@ -414,6 +461,15 @@
 {
     F32 averageFillFlow;                                                                                        ///< Average fill flow rate.
 } DG_HEATERS_RECORD_T;
+
+#ifndef _RELEASE_
+/// DG software configurations
+typedef struct
+{
+    U08 swConfigs[ NUM_OF_SW_CONFIGS ];                                                                         ///< Software configurations.
+} DG_SW_CONFIG_RECORD_T;
+#endif
+
 #pragma pack(pop)
 
 /**@}*/