Index: dialin/dg/calibration_record.py
===================================================================
diff -u -r544b0582e30058b3acb55a690fae0f78081ce6b2 -rf7388cedad143cac22f58b5cc03d26b6826c20c2
--- dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 544b0582e30058b3acb55a690fae0f78081ce6b2)
+++ dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision f7388cedad143cac22f58b5cc03d26b6826c20c2)
@@ -337,8 +337,10 @@
                               self._prepare_volume_record(), self._prepare_acid_concentrates_record(),
                               self._prepare_bicarb_concentrates_record(), self._prepare_filters_record(),
                               self._prepare_fans_record(), self._prepare_accelerometer_sensor_record(),
-                              self._prepare_heating_constants_record()]
-                              #self._prepare_acid_bicarb_fill_conductivity_record()]
+                              self._prepare_heating_constants_record(),
+                              self._prepare_acid_08_1251_1_conductivity_record(),
+                              self._prepare_acid_08_2251_0_conductivity_record(),
+                              self._prepare_acid_08_3251_9_conductivity_record()]
 
         for record, byte_size in records_with_sizes:
             # Update the groups bytes size so far to be use to padding later
@@ -735,53 +737,104 @@
 
         return hardware_group, group_byte_size
 
-    def _prepare_acid_bicarb_fill_conductivity_record(self):
+    def _prepare_acid_08_1251_1_conductivity_record(self):
         """
         Handles creating the calibration dictionary of the acid/bicarb fill conductivities group.
 
         @return: acid/bicarb fill conductivities hardware group dictionary and the byte size of this hardware group
         """
-        hardware_names = ['acid_08_1251_1', 'acid_08_2251_0', 'acid_08_3251_9']
+        hardware_names = ['fill', 'acid_tst', 'bicarb_tst']
         group_byte_size = 0
-        group_name = 'acid_and_bicarb_fill_cond'
+        group_name = 'acid_08_1251_1_fill_cond'
         hardware_group = OrderedDict({group_name: OrderedDict()})
         hardware = OrderedDict()
 
         for i in hardware_names:
-            fill_acid_cond = 0
-            fill_bicarb_cond = 0
-            acid_test_acid_bicarb_cond = 0
+            acid_cond = self._DEFAULT_BIC_TEST_ACID_SNSR_US_PER_CM
+            bicarb_cond = self._DEFAULT_BIC_TEST_BIC_SNSR_US_PER_CM
 
-            if i == 'acid_08_1251_1':
-                fill_acid_cond = self._DEFAULT_FILL_1251_1_ACID_SNSR_US_PER_CM
-                fill_bicarb_cond = self._DEFAULT_FILL_1251_1_BIC_SNSR_US_PER_CM
-                acid_test_acid_bicarb_cond = self._DEFAULT_ACID_TEST_1251_1_US_PER_CM
-            elif i == 'acid_08_2251_0':
-                fill_acid_cond = self._DEFAULT_FILL_2251_0_ACID_SNSR_US_PER_CM
-                fill_bicarb_cond = self._DEFAULT_FILL_2251_0_BIC_SNSR_US_PER_CM
-                acid_test_acid_bicarb_cond = self._DEFAULT_ACID_TEST_2251_0_US_PER_CM
-            elif i == 'acid_08_3251_9':
-                fill_acid_cond = self._DEFAULT_FILL_3251_9_ACID_SNSR_US_PER_CM
-                fill_bicarb_cond = self._DEFAULT_FILL_3251_9_BIC_SNSR_US_PER_CM
-                acid_test_acid_bicarb_cond = self._DEFAULT_ACID_TEST_3251_9_US_PER_CM
+            if i == 'fill':
+                acid_cond = self._DEFAULT_FILL_1251_1_ACID_SNSR_US_PER_CM
+                bicarb_cond = self._DEFAULT_FILL_1251_1_BIC_SNSR_US_PER_CM
+            elif i == 'acid_tst':
+                acid_cond = self._DEFAULT_ACID_TEST_1251_1_US_PER_CM
+                bicarb_cond = self._DEFAULT_ACID_TEST_1251_1_US_PER_CM
 
-            hardware[i] = {# Normal fill target conductivities in uS/cm
-                           'fill_target_acid_cond': ['<f', fill_acid_cond],
-                           'fill_target_bicarb_cond': ['<f', fill_bicarb_cond],
-                           'fill_target_cal_time': ['<i', self._DEFAULT_TIME_VALUE],
-                           'fill_target_crc': ['<H', self._DEFAULT_CRC_VALUE],
-                            # Acid test target conductivities in uS/cm
-                           'acid_test_acid_cond': ['<f', acid_test_acid_bicarb_cond],
-                           'acid_test_bicarb_cond': ['<f', acid_test_acid_bicarb_cond],
-                           'acid_test_cal_time': ['<i', self._DEFAULT_TIME_VALUE],
-                           'acid_test_target_crc': ['<H', self._DEFAULT_CRC_VALUE],
-                            # Bicarb test target conductivities in uS/cm
-                           'bicarb_test_acid_cond': ['<f', self._DEFAULT_BIC_TEST_ACID_SNSR_US_PER_CM],
-                           'bicarb_test_bicarb_cond': ['<f', self._DEFAULT_BIC_TEST_BIC_SNSR_US_PER_CM],
-                           'bicarb_test_cal_time': ['<i', self._DEFAULT_TIME_VALUE],
-                           'bicarb_test_target_crc': ['<H', self._DEFAULT_CRC_VALUE]}
+            hardware[i] = {'acid_cond': ['<f', acid_cond],
+                           'bicarb_cond': ['<f', bicarb_cond],
+                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
+                           'crc': ['<H', self._DEFAULT_CRC_VALUE]}
+
             # Calculate the size of the bytes in this hardware group
             group_byte_size += self._utilities.calculate_group_byte_size(hardware[i])
         hardware_group[group_name] = hardware
 
         return hardware_group, group_byte_size
+
+    def _prepare_acid_08_2251_0_conductivity_record(self):
+        """
+        Handles creating the calibration dictionary of the acid/bicarb fill conductivities group.
+
+        @return: acid/bicarb fill conductivities hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['fill', 'acid_tst', 'bicarb_tst']
+        group_byte_size = 0
+        group_name = 'acid_08_2251_0_fill_cond'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            acid_cond = self._DEFAULT_BIC_TEST_ACID_SNSR_US_PER_CM
+            bicarb_cond = self._DEFAULT_BIC_TEST_BIC_SNSR_US_PER_CM
+
+            if i == 'fill':
+                acid_cond = self._DEFAULT_FILL_2251_0_ACID_SNSR_US_PER_CM
+                bicarb_cond = self._DEFAULT_FILL_2251_0_BIC_SNSR_US_PER_CM
+            elif i == 'acid_tst':
+                acid_cond = self._DEFAULT_ACID_TEST_2251_0_US_PER_CM
+                bicarb_cond = self._DEFAULT_ACID_TEST_2251_0_US_PER_CM
+
+            hardware[i] = {'acid_cond': ['<f', acid_cond],
+                           'bicarb_cond': ['<f', bicarb_cond],
+                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
+                           'crc': ['<H', self._DEFAULT_CRC_VALUE]}
+
+            # Calculate the size of the bytes in this hardware group
+            group_byte_size += self._utilities.calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
+
+        return hardware_group, group_byte_size
+
+    def _prepare_acid_08_3251_9_conductivity_record(self):
+        """
+        Handles creating the calibration dictionary of the acid/bicarb fill conductivities group.
+
+        @return: acid/bicarb fill conductivities hardware group dictionary and the byte size of this hardware group
+        """
+        hardware_names = ['fill', 'acid_tst', 'bicarb_tst']
+        group_byte_size = 0
+        group_name = 'acid_08_3251_9_fill_cond'
+        hardware_group = OrderedDict({group_name: OrderedDict()})
+        hardware = OrderedDict()
+
+        for i in hardware_names:
+            acid_cond = self._DEFAULT_BIC_TEST_ACID_SNSR_US_PER_CM
+            bicarb_cond = self._DEFAULT_BIC_TEST_BIC_SNSR_US_PER_CM
+
+            if i == 'fill':
+                acid_cond = self._DEFAULT_FILL_3251_9_ACID_SNSR_US_PER_CM
+                bicarb_cond = self._DEFAULT_FILL_3251_9_BIC_SNSR_US_PER_CM
+            elif i == 'acid_tst':
+                acid_cond = self._DEFAULT_ACID_TEST_3251_9_US_PER_CM
+                bicarb_cond = self._DEFAULT_ACID_TEST_3251_9_US_PER_CM
+
+            hardware[i] = {'acid_cond': ['<f', acid_cond],
+                           'bicarb_cond': ['<f', bicarb_cond],
+                           'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
+                           'crc': ['<H', self._DEFAULT_CRC_VALUE]}
+
+            # Calculate the size of the bytes in this hardware group
+            group_byte_size += self._utilities.calculate_group_byte_size(hardware[i])
+        hardware_group[group_name] = hardware
+
+        return hardware_group, group_byte_size
Index: tests/dg_nvm_scripts.py
===================================================================
diff -u -rd2a920fb57105d383a9845a4491e74b5af0f15ff -rf7388cedad143cac22f58b5cc03d26b6826c20c2
--- tests/dg_nvm_scripts.py	(.../dg_nvm_scripts.py)	(revision d2a920fb57105d383a9845a4491e74b5af0f15ff)
+++ tests/dg_nvm_scripts.py	(.../dg_nvm_scripts.py)	(revision f7388cedad143cac22f58b5cc03d26b6826c20c2)
@@ -54,7 +54,7 @@
     # Use cmd_set_dg_calibration_excel_to_fw() set the changes back to firmware
     # This function requires an address for the excel report. Use the absolute address of your excel report like the
     # example below
-    dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2024-02-24-DG-Record.xlsx')
+    dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2024-03-02-DG-Record.xlsx')
 
     # For resetting the calibration record to benign values, use the function below
     #dg.calibration_record.cmd_reset_dg_calibration_record()
Index: tests/dg_tests.py
===================================================================
diff -u -rd2a920fb57105d383a9845a4491e74b5af0f15ff -rf7388cedad143cac22f58b5cc03d26b6826c20c2
--- tests/dg_tests.py	(.../dg_tests.py)	(revision d2a920fb57105d383a9845a4491e74b5af0f15ff)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision f7388cedad143cac22f58b5cc03d26b6826c20c2)
@@ -748,7 +748,7 @@
 
     # cmd_set_disinfect_ui_screen()
 
-    collect_treatment_data()
+    #collect_treatment_data()
 
     #run_ro_permeate_sample()
 
@@ -782,3 +782,4 @@
     #    print(hd.alarms.get_alarm_state(286), hd.alarms.get_alarm_state(289), dg.alarms.get_alarm_state(286),
     #          dg.alarms.get_alarm_state(289))
     #    sleep(0.5)
+    dg.cmd_dg_set_operation_mode(1)