Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r7d3731085a0c0a51daf7733236461f4f56a1126a -r6b11ea4a37a54cd47af543900dfa68dac27c8c7e
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 7d3731085a0c0a51daf7733236461f4f56a1126a)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 6b11ea4a37a54cd47af543900dfa68dac27c8c7e)
@@ -8,7 +8,7 @@
 * @file    NVDataMgmtDGRecords.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @date    (last)      01-Jul-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  12-Feb-2021
@@ -38,13 +38,30 @@
 /// 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_TRIMMER_HEATER = 0,                                                                      ///< Software configuration disable trimmer heater.
+    SW_CONFIG_DISABLE_ACCELS,                                                                                  ///< Software configuration disable accelerometers.
     SW_CONFIG_DISABLE_CAL_CHECK,                                                                               ///< Software configuration disable calibration check.
-    SW_CONFIG_ALARMS_DEBUG,                                                                                    ///< Software configuration alarms debug.
+    SW_CONFIG_DISABLE_HEATERS_MONITOR,                                                                         ///< Software configuration disable heaters monitor.
+    SW_CONFIG_DISABLE_DRAIN_PUMP_MONITOR,                                                                      ///< Software configuration disable drain pump monitor.
     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.
+    SW_CONFIG_DISABLE_WATER_QUALITY_CHECK,                                                                     ///< Software configuration disable water quality check.
+    SW_CONFIG_DISABLE_FLOW_VS_LOAD_CELL_CHECK_IN_FILL,                                                         ///< Software configuration disable flow vs. load cell check in fill.
+    SW_CONFIG_DISABLE_HEATERS_EFFICIENCY,                                                                      ///< Software configuration disable heaters efficiency.
+    SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK,                                                            ///< Software configuration disable disinfect conductivity check.
+    SW_CONFIG_DISABLE_CONC_PUMPS,                                                                              ///< Software configuration disable concentrate pumps.
+    SW_CONFIG_DISABLE_CAPS_MONITOR,                                                                            ///< Software configuration disable cap monitor.
+    SW_CONFIG_DISABLE_UV_REACTORS,                                                                             ///< Software configuration disable UV reactors.
+    SW_CONFIG_DISABLE_ACID_ALARMS,                                                                             ///< Software configuration disable acid alarms.
+    SW_CONFIG_DISABLE_BICARB_ALARMS,                                                                           ///< Software configuration disable bicarb alarms.
+    SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM,                                                                     ///< Software configuration disable empty bottle alarms.
+    SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST,                                                                ///< Software configuration disable bicarb conductivity test.
+    SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST,                                                                  ///< Software configuration disable acid conductivity test.
+    SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM,                                                                  ///< Software configuration disable concentrate pumps speed alarm.
+    SW_CONFIG_DISABLE_MIXING_IN_FILL,                                                                          ///< Software configuration disable mixing in fill.
+    SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM,                                                               ///< Software configuration disable temperature sensors alarm.
+    SW_CONFIG_ENABLE_V3_SYSTEM,                                                                                ///< Software configuration enable V3 system.
     NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;
 #endif
@@ -452,7 +469,10 @@
 /// DG usage info structure.
 typedef struct
 {
-    U32 waterConsumption;                                                                                       ///< Water consumption.
+    F32 roWaterGenTotalL;                                                                                       ///< Total RO water generated in liters. (Cannot be reset)
+    F32 roWaterGenSinceLastServiceL;                                                                            ///< RO water generated since last treatment in liters.
+    U32 lastDisinfectDate;                                                                                      ///< Last disinfect date in epoch.
+    U32 isDisinfected;                                                                                          ///< Disinfect status boolean flag.
     U16 crc;                                                                                                    ///< CRC for the DG usage info structure.
 } DG_USAGE_INFO_RECORD_T;