Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r76839e8e33ddd005283fcb1e068afbdab48603c6 -r59871c9964559b5137781af9c2eeed6bab18ef73
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 76839e8e33ddd005283fcb1e068afbdab48603c6)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 59871c9964559b5137781af9c2eeed6bab18ef73)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    NVDataMgmtDGRecords.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      10-Mar-2023
+* @date    (last)      10-Jun-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  12-Feb-2021
@@ -48,7 +48,7 @@
     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_RO_RATIO_CHECK,                         // TODO remove                                                  ///< 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.
@@ -57,13 +57,13 @@
     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_VOLTAGES_MONITOR,                                                                        ///< Software configuration disable voltages monitor.
     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_BICARB_CONDUCTIVITY_TEST,                 // TODO remove                                               ///< Software configuration disable bicarb conductivity test.
+    SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST,                   // TODO remove                                               ///< 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_MIXING_IN_FILL,                           // TODO remove                                               ///< Software configuration disable mixing in fill.
     SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM,                                                               ///< Software configuration disable temperature sensors alarm.
     SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK,                                                                  ///< Software configuration disable concentrate pumps park feature.
     SW_CONFIG_ENABLE_USING_TPO_FOR_PRIMARY_HEATER_CONTROL,                                                     ///< Software configuration enable TPo for primary heater control.
@@ -160,8 +160,8 @@
     CAL_DATA_CPO_COND_SENSOR,                                                                                  ///< CPo conductivity sensor.
     CAL_DATA_CD1_COND_SENSOR,                                                                                  ///< CD1 conductivity sensor.
     CAL_DATA_CD2_COND_SENSOR,                                                                                  ///< CD2 conductivity sensor.
-    CAL_DATA_CD1_CHEM_DIS_COND_SENSOR,                                                                         ///< CD1 chemical disinfect conductivity sensor.
-    CAL_DATA_CD2_CHEM_DIS_COND_SENSOR,                                                                         ///< CD2 chemical disinfect conductivity sensor.
+    CAL_DATA_CD2_COND_SENSOR_CHEM_DISINFECT,                                                                   ///< CD2 chemical disinfect conductivity sensor.
+    CAL_DATA_CD2_COND_SENSOR_FILL_BICARB_TEST,                                                                 ///< CD2 conductivity sensor fill bicarb test.
     NUM_OF_CAL_DATA_COND_SENSORS,                                                                              ///< Number of conductivity sensors.
 } CAL_DATA_DG_COND_SENSORS_T;