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)