Index: dialin/common/dg_defs.py
===================================================================
diff -u -r0e68ec6bb733a8ab7b21a82f8b571f1678f9d2cd -r220295a464eca249a5b396aac4b503623936afea
--- dialin/common/dg_defs.py	(.../dg_defs.py)	(revision 0e68ec6bb733a8ab7b21a82f8b571f1678f9d2cd)
+++ dialin/common/dg_defs.py	(.../dg_defs.py)	(revision 220295a464eca249a5b396aac4b503623936afea)
@@ -225,29 +225,33 @@
     DG_CHEM_DISINFECT_STATE_COMPLETE = 14
     NUM_OF_DG_CHEM_DISINFECT_STATES = 15
 
+
 @unique
 class DGChemDisinfectFlushStates(DialinEnum):
-
     DG_CHEM_DISINFECT_FLUSH_STATE_START = 0
-    DG_CHEM_DISINFECT_FLUSH_STATE_DISINFECTANT_DRAIN_R1 = 1
-    DG_CHEM_DISINFECT_FLUSH_STATE_DISINFECTANT_DRAIN_R2 = 2
+    DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1 = 1
+    DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R2 = 2
     DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN = 3
     DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE = 4
     DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_UF = 5
     DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1 = 6
-    DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2 = 7
-    DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH = 8
-    DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH = 9
-    DG_CHEM_DISINFECT_FLUSH_STATE_COMPLETE = 10
-    NUM_OF_DG_CHEM_DISINFECT_FLUSH_STATES = 11
+    DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2  =7
+    DG_CHEM_DISINFECT_FLUSH_STATE_SAMPLE_FLUSH_R1_TO_R2_DRAIN_R2 = 8
+    DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH = 9
+    DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH = 10
+    DG_CHEM_DISINFECT_FLUSH_STATE_COMPLETE = 11
+    NUM_OF_DG_CHEM_DISINFECT_FLUSH_STATES = 12
 
+
 @unique
 class DGChemDisinfectFlushUIStates(DialinEnum):
     CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING = 0
     CHEM_DISINFECT_FLUSH_UI_STATE_FLUSH_AFTER_DISINFECT = 1
     CHEM_DISINFECT_FLUSH_UI_STATE_CANCEL_FLUSH = 2
     CHEM_DISINFECT_FLUSH_UI_STATE_COMPLETE = 3
     NUM_OF_CHEM_DISINFECT_FLUSH_UI_STATES = 4
+
+
 @unique
 class DGChemDisinfectUIStates(DialinEnum):
     CHEM_DISINFECT_UI_STATE_NOT_RUNNING = 0
Index: dialin/dg/chemical_disinfect.py
===================================================================
diff -u -racd09d02879e8add4cf7f694f5db8e423a76c341 -r220295a464eca249a5b396aac4b503623936afea
--- dialin/dg/chemical_disinfect.py	(.../chemical_disinfect.py)	(revision acd09d02879e8add4cf7f694f5db8e423a76c341)
+++ dialin/dg/chemical_disinfect.py	(.../chemical_disinfect.py)	(revision 220295a464eca249a5b396aac4b503623936afea)
@@ -49,8 +49,6 @@
         self.cancellation_mode = 0
         self.r1_level = 0
         self.r2_level = 0
-        self.target_post_rinse_count = 0
-        self.current_post_rinse_count = 0
         self.chemical_disinfect_ui_state = 0
 
         if self.can_interface is not None:
@@ -79,8 +77,6 @@
         self.cancellation_mode = 0
         self.r1_level = 0
         self.r2_level = 0
-        self.target_post_rinse_count = 0
-        self.current_post_rinse_count = 0
         self.chemical_disinfect_ui_state = 0
 
     @publish(["chemical_disinfect_elapsed_time", "chemical_disinfect_target_time"])
@@ -100,8 +96,7 @@
         self.chemical_disinfect_elapsed_time = int(disinfect_elapsed_time / 1000)
 
     @publish(["chemical_disinfect_state", "overall_elapsed_time", "state_elapsed_time", "cancellation_mode",
-              "r1_level", "r2_level", "target_post_rinse_count", "current_post_rinse_count",
-              "chemical_disinfect_ui_state"])
+              "r1_level", "r2_level", "chemical_disinfect_ui_state"])
     def _handler_chemical_disinfect_sync(self, message):
         """
         Handles published chemical disinfect message
@@ -121,19 +116,13 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
         r2 = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        target_post_rinse_cnt = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        current_post_rinse_cnt = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
         chem_ui_state = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
+            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
 
         self.chemical_disinfect_state = state
         self.overall_elapsed_time = int(elapsed_time / 1000)
         self.state_elapsed_time = int(state_elapsed_time / 1000)
         self.cancellation_mode = cancellation_mode
         self.r1_level = r1
         self.r2_level = r2
-        self.target_post_rinse_count = target_post_rinse_cnt
-        self.current_post_rinse_count = current_post_rinse_cnt
         self.chemical_disinfect_ui_state = chem_ui_state
Index: dialin/dg/chemical_disinfect_flush.py
===================================================================
diff -u -racd09d02879e8add4cf7f694f5db8e423a76c341 -r220295a464eca249a5b396aac4b503623936afea
--- dialin/dg/chemical_disinfect_flush.py	(.../chemical_disinfect_flush.py)	(revision acd09d02879e8add4cf7f694f5db8e423a76c341)
+++ dialin/dg/chemical_disinfect_flush.py	(.../chemical_disinfect_flush.py)	(revision 220295a464eca249a5b396aac4b503623936afea)
@@ -37,9 +37,6 @@
         self.flush_state = DGChemDisinfectFlushStates.DG_CHEM_DISINFECT_FLUSH_STATE_START.value
         self.overall_elapsed_time = 0
         self.state_elapsed_time = 0
-        self.r1 = 0.0
-        self.r2 = 0.0
-        self.target_rinse_count = 0
         self.rinse_count = 0
         self.flush_UI_state = DGChemDisinfectFlushUIStates.CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING.value
 
@@ -77,25 +74,14 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
         cancellation_mode = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        r1 = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        r2 = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        target_rinse_count = struct.unpack('<I', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
         rinse_count = struct.unpack('<I', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
-        ui = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
+            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
         flush_ui_state = struct.unpack('<I', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]
+            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
 
         self.flush_state = state
         self.overall_elapsed_time = int(elapsed_time / 1000)
         self.state_elapsed_time = int(state_elapsed_time / 1000)
-        self.r1 = r1
-        self.r2 = r2
-        self.target_rinse_count = target_rinse_count
         self.rinse_count = rinse_count
         self.flush_UI_state = flush_ui_state
 
Index: tests/dg_nvm_scripts.py
===================================================================
diff -u -r0e68ec6bb733a8ab7b21a82f8b571f1678f9d2cd -r220295a464eca249a5b396aac4b503623936afea
--- tests/dg_nvm_scripts.py	(.../dg_nvm_scripts.py)	(revision 0e68ec6bb733a8ab7b21a82f8b571f1678f9d2cd)
+++ tests/dg_nvm_scripts.py	(.../dg_nvm_scripts.py)	(revision 220295a464eca249a5b396aac4b503623936afea)
@@ -32,7 +32,7 @@
     # Use cmd_set_dg_sw_config_record() 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.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2022-12-28-DG-SW-CONFIGS-Record.xlsx')
+    dg.sw_configs.cmd_update_dg_sw_config_record('/home/fw/projects/DG_NV_Records/2023-01-12-DG-SW-CONFIGS-Record.xlsx')
 
     # Use this function to reset the configuration records to all be 0
     #dg.sw_configs.cmd_reset_dg_sw_config_record()
@@ -112,11 +112,11 @@
 
     if dg.cmd_log_in_to_dg():
 
-        #run_sw_configs_commands()
+        run_sw_configs_commands()
 
         #run_calibration_commands()
 
-        run_system_commands()
+        #run_system_commands()
 
         #run_usage_info_commands()
 
Index: tests/dg_tests.py
===================================================================
diff -u -r0e68ec6bb733a8ab7b21a82f8b571f1678f9d2cd -r220295a464eca249a5b396aac4b503623936afea
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 0e68ec6bb733a8ab7b21a82f8b571f1678f9d2cd)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 220295a464eca249a5b396aac4b503623936afea)
@@ -56,29 +56,53 @@
 
 
 def get_chemical_disinfect_mode_info():
+    state = 0
+    state_elapsed_time = 0
+    overall_elapsed_time = 0
+    if dg.dg_operation_mode == 10:
+        state = DGChemicalDisinfectStates(dg.chemical_disinfect.chemical_disinfect_state).name
+        overall_elapsed_time = dg.chemical_disinfect.overall_elapsed_time
+        state_elapsed_time = dg.chemical_disinfect.state_elapsed_time
+    elif dg.dg_operation_mode == 11:
+        state = DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name
+        overall_elapsed_time = dg.chemical_disinfect_flush.overall_elapsed_time
+        state_elapsed_time = dg.chemical_disinfect_flush.state_elapsed_time
+
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, '
             'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, '
             'Total_rinse_count, {}, UI_state, {}, Top_alarm, {}, '
-            .format(DGChemicalDisinfectStates(dg.chemical_disinfect.chemical_disinfect_state).name,
-                    dg.chemical_disinfect.overall_elapsed_time, dg.chemical_disinfect.state_elapsed_time,
+            .format(state, overall_elapsed_time, state_elapsed_time,
                     dg.chemical_disinfect.chemical_disinfect_elapsed_time,
                     ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level,
-                    dg.chemical_disinfect.r2_level, dg.chemical_disinfect.current_post_rinse_count,
-                    dg.chemical_disinfect.target_post_rinse_count,
+                    dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, 0,
+                    #dg.chemical_disinfect_flush.target_rinse_count,
                     DGChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name,
                     hd.alarms.alarm_top))
     return info
 
+
 def get_chemical_disinfect_flush_mode_info():
+    state = 0
+    state_elapsed_time = 0
+    overall_elapsed_time = 0
+    if dg.dg_operation_mode == 10:
+        state = DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name
+        overall_elapsed_time = dg.chemical_disinfect.overall_elapsed_time
+        state_elapsed_time = dg.chemical_disinfect.state_elapsed_time
+    elif dg.dg_operation_mode == 11:
+        state = DGHeatDisinfectActiveCoolStates(dg.heat_disinfect_active_cool.heat_disinfect_active_cool_state).name
+        overall_elapsed_time = dg.heat_disinfect_active_cool.overall_elapsed_time
+        state_elapsed_time = dg.heat_disinfect_active_cool.state_elapsed_time
+
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, r1, {:5.1f}, r2, {:5.1f}, '
-             'Target_rinse_count, {}, Rinse_count, {}, Top_alarm, {}, UI_state, {},'
-            .format(DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name,
-                    dg.chemical_disinfect_flush.overall_elapsed_time, dg.chemical_disinfect_flush.state_elapsed_time,
+            'Target_rinse_count, {}, Rinse_count, {}, Top_alarm, {}, UI_state, {},'
+            .format(state, overall_elapsed_time, state_elapsed_time,
                     dg.chemical_disinfect_flush.r1, dg.chemical_disinfect_flush.r2,
                     dg.chemical_disinfect_flush.target_rinse_count, dg.chemical_disinfect_flush.rinse_count,
                     hd.alarms.alarm_top, dg.chemical_disinfect_flush.flush_UI_state))
     return info
 
+
 def get_heat_disinfect_mode_info():
     state = 0
     state_elapsed_time = 0
@@ -107,6 +131,7 @@
                     dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top))
     return info
 
+
 def get_hd_run_info():
     info = ('HD_op_mode, {}, HD_sub_mode, {}, Top_alarm, {}, Target_UF_ml, {:5.3f}, Meas_UF_ml, {:5.3f}, '
             'Wet_test_state, {}, Post_tx_state, {}, Post_tx_drain_state, {}, Prime_state, {}, Pre_Tx_rsrvr_state, {}, '
@@ -534,7 +559,8 @@
 def run_chemical_disinfect():
     complete_counter = 1
     f = open("/home/fw/projects/dialin/tests/chemical_disinfect.log", "w")
-    dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect()
+    #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect()
+    dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush()
 
     try:
         while True:
@@ -569,8 +595,10 @@
 
     except KeyboardInterrupt:
         dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect(start=False)
+        dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush(start=False)
         f.close()
 
+
 def run_chem_disinfect_flush_mode():
     complete_counter = 1
     f = open("/home/fw/projects/dialin/tests/chem_disinfect_flush_mode.log", "w")
@@ -587,7 +615,7 @@
             conc = get_concentrate_pumps_info()
             valves = get_dg_valves_states()
 
-            var = flush + load_cell + drain + ro + + temp + conc + valves + '\r'
+            var = flush + load_cell + drain + ro + temp + conc + valves + '\r'
 
             print(var)
             f.write(var)