Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -r0cca339a72337e4c56665e7c5aff65944909cfb3 -rf9ade5206d6da9dc2ef510ef0d985ecc4bf44924
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 0cca339a72337e4c56665e7c5aff65944909cfb3)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision f9ade5206d6da9dc2ef510ef0d985ecc4bf44924)
@@ -3,8 +3,8 @@
 import sys
 sys.path.append("..")
 from dialin.dg.dialysate_generator import DG
-from dialin.dg.heat_disinfect import HeatDisinfectStates, HeatCancellationModes
-from dialin.dg.chemical_disinfect import ChemicalDisinfectStates, ChemCancellationModes
+from dialin.dg.heat_disinfect import HeatDisinfectStates, HeatCancellationModes, HeatDisinfectUIStates
+from dialin.dg.chemical_disinfect import ChemicalDisinfectStates, ChemCancellationModes, ChemDisinfectUIStates
 from dialin.dg.drain_pump import DrainPumpStates
 from dialin.dg.thermistors import ThermistorsNames
 from dialin.dg.temperature_sensors import TemperatureSensorsNames
@@ -17,13 +17,14 @@
 
     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, {}, '
+            'Total_rinse_count, {}, UI_state, {}, '
             .format(ChemicalDisinfectStates(dg.chemical_disinfect.chemical_disinfect_state).name,
                     dg.chemical_disinfect.overall_elapsed_time, dg.chemical_disinfect.state_elapsed_time,
-                    dg.chemical_disinfect.disinfect_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.current_post_rinse_count,
+                    dg.chemical_disinfect.target_post_rinse_count,
+                    ChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name))
     return info
 
 
@@ -40,13 +41,12 @@
 def get_heat_disinfect_mode_info():
 
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, '
-            'Cancellation_mode, {}, R1_level, {:5.3f}, R1_drift, {:5.3f}, R2_level, {:5.3f}, R2_drift, {:5.3f}, '
+            'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, UI_state, {}, '
             .format(HeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name,
                     dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time,
-                    dg.heat_disinfect.disinfect_elapsed_time,
+                    dg.heat_disinfect.heat_disinfect_elapsed_time,
                     HeatCancellationModes(dg.heat_disinfect.cancellation_mode).name, dg.heat_disinfect.r1_level,
-                    (dg.heat_disinfect.r1_level - dg.load_cells.load_cell_A1), dg.heat_disinfect.r2_level,
-                    (dg.heat_disinfect.r2_level - dg.load_cells.load_cell_B1)))
+                    dg.heat_disinfect.r2_level, HeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name))
     return info
 
 
@@ -318,11 +318,11 @@
 
     #run_chemical_disinfect()
 
-    run_dg()
+    #run_dg()
 
-    #hd = HD()
-    #sleep(1)
-    #hd.ui.cmd_ui_set_standby_submode_to_disinfect()
+    hd = HD()
+    sleep(1)
+    hd.ui.cmd_ui_set_standby_submode_to_disinfect()