Index: tests/dg_tests.py
===================================================================
diff -u -rd6827e997b3d9a9eb5a586505802458184e1d68e -r45f70ed84010200e8582a25ccd8792100f4f4fc4
--- tests/dg_tests.py	(.../dg_tests.py)	(revision d6827e997b3d9a9eb5a586505802458184e1d68e)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 45f70ed84010200e8582a25ccd8792100f4f4fc4)
@@ -8,7 +8,7 @@
 # @file    dg_tests.py
 #
 # @author  (last)      Dara Navaei
-# @date    (last)      31-Mar-2022
+# @date    (last)      20-Jun-2022
 # @author  (original)  Dara Navaei
 # @date    (original)  16-Jan-2022
 #
@@ -17,6 +17,7 @@
 
 from dialin.dg.dialysate_generator import DG
 from dialin.hd.hemodialysis_device import HD
+from dialin.ui.hd_simulator import HDSimulator
 from dialin.common.dg_defs import DGHeatDisinfectStates, DGHeatDisinfectUIStates
 from dialin.dg.heat_disinfect import HeatCancellationModes
 from dialin.common.dg_defs import DGChemicalDisinfectStates, DGChemDisinfectUIStates
@@ -189,13 +190,13 @@
 
 def get_heaters_info():
     info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trimmer_state, {}, '
-            'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, Dia_flow, {:5.3f}, '
-            'Interim_int_temp, {:5.3f}, Heater_RO_flow, {:5.3f}, Primary_volt, {:5.3f}, Trimmer_volt, {:5.3f}, '.
+            'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, '
+            'Primary_calc_temp, {:5.3f}, Trimmer_calc_temp, {:5.3f}, Primary_volt, {:5.3f}, Trimmer_volt, {:5.3f}, '.
             format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.primary_heater_state,
                    dg.heaters.trimmer_heater_duty_cycle, dg.heaters.trimmer_heater_state,
                    dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature,
-                   dg.heaters.primary_efficiency, dg.heaters.temporary_remove_flow,
-                   dg.heaters.temporary_internal_target, dg.heaters.temporary_target_ro_flow,
+                   dg.heaters.primary_efficiency, dg.heaters.primary_heaters_target_temperature,
+                   dg.heaters.trimmer_calc_target_temperature,
                    dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value],
                    dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value]))
     return info
@@ -633,17 +634,25 @@
 
     # cmd_set_disinfect_ui_screen()
 
-    collect_treatment_data()
+    #collect_treatment_data()
 
     #collect_hd_treatment()
 
     # test_hd_fans_alarms()
 
     # test_dg_fans_alarms()
-    #while True:
-    #    print(get_dg_fans_info())
+
+    dg.drain_pump.cmd_drain_pump_set_rpm(2000)
+
+    while True:
+        print(get_drain_states_info(), get_temperature_sensors_info(), get_dg_fans_info())
         #print(hd.hd_debug_events)
-    #    sleep(1)
+        sleep(1)
 
-    #dg.ro_pump.cmd_ro_pump_measured_flow_rate_override(0.0, reset=1)
 
+
+
+    #ui = HDSimulator()
+    #ui.cmd_send_hd_operation_mode(3, 1)
+
+