Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -re524ce9de21e745291c9bdd6cd0c86268c03331b -rad9f74cb039beea1bea1f8eb744870acd28650b4
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision e524ce9de21e745291c9bdd6cd0c86268c03331b)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision ad9f74cb039beea1bea1f8eb744870acd28650b4)
@@ -26,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.common.hd_defs import HDOpModes, HDOpSubModes
 from dialin.common.dg_defs import DGEventList
 from time import sleep
 from datetime import datetime
@@ -68,6 +69,12 @@
     return info
 
 
+def get_hd_run_info():
+    info = ('HD_op_mode, {}, HD_sub_mode, {}, '.format(HDOpModes(hd.hd_operation_mode).name,
+                                                       hd.hd_operation_sub_mode))
+    return info
+
+
 def get_dg_run_info():
     # info = ('DG_op_mode, {}, DG_sub_mode, {}, Op, {}, Sub, {}, '.format(DGOperationModes(dg.dg_operation_mode).name,
     #                                                                 dg.dg_operation_sub_mode,
@@ -132,20 +139,10 @@
 
 
 def get_heaters_info():
-    info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_state, {}, Pri_int_temp, {:5.3f}, Prim_CJ_temp, {:5.3f}, '
-            'Prim_TC_temp, {:5.3f}, Trimmer_DC, {:5.3f}, Trim_int_temp, {:5.3f}, Trim_CJ_temp, {:5.3f}, '
-            'Trim_TC_temp, {:5.3f}, Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '.
+    info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, '
+            'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '.
             format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle,
-                   dg.heaters.primary_heater_state,
-                   dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_INTERNAL.name],
-                   dg.temperature_sensors.temperature_sensors[
-                       TemperatureSensorsNames.PRIMARY_HEATER_COLD_JUNCTION.name],
-                   dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_THERMOCOUPLE.name],
-                   dg.heaters.trimmer_heater_duty_cycle,
-                   dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_INTERNAL.name],
-                   dg.temperature_sensors.temperature_sensors[
-                       TemperatureSensorsNames.TRIMMER_HEATER_COLD_JUNCTION.name],
-                   dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_THERMOCOUPLE.name],
+                   dg.heaters.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle,
                    dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature))
     return info
 
@@ -430,6 +427,7 @@
 
     try:
         while True:
+            hd_run = get_dg_run_info()
             dg_run = get_dg_run_info()
             drain = get_drain_states_info()
             load_cell = get_load_cells_info()
@@ -439,7 +437,7 @@
             heaters = get_heaters_info()
             dg_fans = get_dg_fans_info()
 
-            var = dg_run + load_cell + drain + ro + temp + heaters + dg_fans + valves + '\r'
+            var = str(datetime.now) + hd_run + dg_run + load_cell + drain + ro + temp + heaters + dg_fans + valves + '\r'
 
             print(var)
             f.write(var)