Index: tests/dg_tests.py
===================================================================
diff -u -r293a9792727fc7d9e87ee14055c19316a8f0c907 -r15f32cc3ef0d7629c1ace716ccdab0cf6975b42f
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 293a9792727fc7d9e87ee14055c19316a8f0c907)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 15f32cc3ef0d7629c1ace716ccdab0cf6975b42f)
@@ -21,6 +21,7 @@
 from dialin.common.dg_defs import DGHeatDisinfectStates, DGHeatDisinfectUIStates
 from dialin.dg.heat_disinfect import HeatCancellationModes
 from dialin.common.dg_defs import DGChemicalDisinfectStates, DGChemDisinfectUIStates
+from dialin.common.dg_defs import DGChemDisinfectFlushStates, DGChemDisinfectFlushUIStates
 from dialin.dg.chemical_disinfect import ChemCancellationModes
 from dialin.dg.drain_pump import DrainPumpStates
 from dialin.dg.thermistors import ThermistorsNames
@@ -68,6 +69,15 @@
                     hd.alarms.alarm_top))
     return info
 
+def get_chemical_disinfect_flush_mode_info():
+    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,
+                    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
@@ -87,18 +97,16 @@
             .format(state, overall_elapsed_time, state_elapsed_time,
                     dg.heat_disinfect.heat_disinfect_count_down_time, dg.heat_disinfect.r1_level,
                     dg.heat_disinfect.r2_level, hd.alarms.alarm_top,
-                    DGHeatDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name))
+                    DGHeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name))
     return info
 
 
 def get_flush_mode_info():
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, '
             .format(DGFlushStates(dg.flush.flush_state).name, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time,
                     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, {}, '
@@ -288,7 +296,8 @@
                     dg.concentrate_pumps.concentrate_pump_cp2_measured_speed,
                     dg.concentrate_pumps.concentrate_pump_cp1_current_set_speed,
                     dg.concentrate_pumps.concentrate_pump_cp1_measured_speed,
-                    dg.conductivity_sensors.conductivity_sensor_cpo, dg.conductivity_sensors.conductivity_sensor_cd1,
+                    dg.conductivity_sensors.conductivity_sensor_cpo,
+                    dg.conductivity_sensors.conductivity_sensor_cd1,
                     dg.conductivity_sensors.conductivity_sensor_cd2,
                     DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp1_current_state).name,
                     DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp2_current_state).name,
@@ -538,9 +547,10 @@
             ro = get_ro_info()
             temp = get_temperature_sensors_info()
             heaters = get_heaters_info()
-            fans = get_dg_fans_info()
+            #fans = get_dg_fans_info()
 
-            var = disinfect + load_cell + conc + drain + ro + temp + heaters + fans + valves + '\r'
+            #var = disinfect + load_cell + conc + drain + ro + temp + heaters + fans + valves + '\r'
+            var = disinfect + load_cell + conc + drain + ro + temp + heaters + valves + '\r'
 
             print(var)
             f.write(var)
@@ -561,7 +571,49 @@
         dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect(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")
+    dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush()
+    #dg.cmd_dg_software_reset_request()
 
+    try:
+        while True:
+            flush = get_chemical_disinfect_flush_mode_info()
+            load_cell = get_load_cells_info()
+            drain = get_drain_states_info()
+            ro = get_ro_info()
+            temp = get_temperature_sensors_info()
+            conc = get_concentrate_pumps_info()
+            valves = get_dg_valves_states()
+
+            var = flush + load_cell + drain + ro + + temp + conc + valves + '\r'
+
+            print(var)
+            f.write(var)
+            sleep(1)
+
+            # If the mode came back to standby or standby solo
+            if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4:
+
+                # Write a few more complete states to make sure the complete state items are recorded
+                if complete_counter == 3:
+                    f.close()
+                    #events = dg.events.get_dg_events(2, 60)
+                    #for event in events:
+                    #    print(event)
+                    break
+
+                complete_counter += 1
+
+    except KeyboardInterrupt:
+        dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush(start=False)
+        f.close()
+        #events = dg.events.get_dg_events(2, 50)
+        #for event in events:
+        #    print(event)
+
+
 def cmd_set_disinfect_ui_screen():
     hd = HD()
     sleep(0.5)
@@ -589,7 +641,6 @@
             valves = get_dg_valves_states()
 
             var = flush + uv_reactors + load_cell + drain + ro + conc + valves + '\r'
-
             print(var)
             f.write(var)
             sleep(1)
@@ -657,6 +708,8 @@
 
     #run_chemical_disinfect()
 
+    run_chem_disinfect_flush_mode()
+
     #run_dg()
 
     # cmd_set_disinfect_ui_screen()