Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r1797ae184a55396ff3464cead47f16bac9dda84c -rf853004049bc4701d911701e48768cd17189faea
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 1797ae184a55396ff3464cead47f16bac9dda84c)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision f853004049bc4701d911701e48768cd17189faea)
@@ -34,6 +34,26 @@
 #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
+{
+    // 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;
+
+// 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
 {
@@ -42,8 +62,11 @@
     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_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.
@@ -414,6 +437,17 @@
 {
     F32 averageFillFlow;                                                                                        ///< Average fill flow rate.
 } DG_HEATERS_RECORD_T;
+
+/// DG reservoir and ultrafilter Tau and ultrafilter volume
+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_RSRVRS_AND_UF_CAL_RECORD_T;
+
 #pragma pack(pop)
 
 /**@}*/