Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -rd9310e1930f9237650263dcad07f676439468b50 -r107697bd31dc87e450f18cca334025c631a6825d
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision d9310e1930f9237650263dcad07f676439468b50)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 107697bd31dc87e450f18cca334025c631a6825d)
@@ -1,3 +1,18 @@
+###########################################################################
+#
+# Copyright (c) 2019-2021 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    dg_heat_and_chemical_disinfect_test.py
+#
+# @author  (last)      Dara Navaei
+# @date    (last)      30-Jun-2021
+# @author  (original)  Dara Navaei
+# @date    (original)  02-May-2021
+#
+############################################################################
 
 
 from dialin.dg.dialysate_generator import DG
@@ -11,6 +26,7 @@
 from dialin.dg.temperature_sensors import TemperatureSensorsNames
 from dialin.dg.dialysate_generator import DGOperationModes
 from dialin.hd.temperatures import HDTemperaturesNames
+from dialin.dg.events import DGEvents
 from time import sleep
 from datetime import datetime
 import sys
@@ -56,8 +72,9 @@
 
 def get_dg_run_info():
 
-    info = ('DG_op_mode, {}, DG_sub_mode, {}, '.format(DGOperationModes(dg.dg_operation_mode).name,
-                                                       dg.dg_operation_sub_mode))
+    info = ('DG_op_mode, {}, DG_sub_mode, {}, DG_event, {}, '.format(DGOperationModes(dg.dg_operation_mode).name,
+                                                                     dg.dg_operation_sub_mode,
+                                                                     dg.events.get_dg_events()))
     return info
 
 
@@ -101,10 +118,10 @@
 
 def get_ro_info():
 
-    info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Tgt_flow, {:5.3f}, '
+    info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Tgt_flow, {:5.3f}, Temp_flow, {:5.3f}, '
             .format(dg.ro_pump.ro_pump_state, dg.pressures.ro_pump_inlet_pressure,
                     dg.pressures.ro_pump_outlet_pressure, dg.ro_pump.pwm_duty_cycle_pct,
-                    dg.ro_pump.measured_flow_rate_lpm, dg.ro_pump.target_flow_lpm))
+                    dg.ro_pump.measured_flow_rate_lpm, dg.ro_pump.target_flow_lpm, dg.ro_pump.temporary_flow_value))
     return info
 
 
@@ -288,7 +305,7 @@
             print(var)
             f.write(var)
 
-            if run_number > 5 and dg.dg_operation_sub_mode == 2:
+            if run_number > 7 and dg.dg_operation_sub_mode == 2:
                 dg.hd_proxy.cmd_start_stop_dg(start=False)
                 f.close()
                 break
@@ -528,9 +545,9 @@
 
     #run_chemical_disinfect()
 
-    #run_dg()
+    run_dg()
 
-    run_ro_pump_duty_cycles()
+    #run_ro_pump_duty_cycles()
 
     #cmd_set_disinfect_ui_screen()