Index: dialin/dg/heat_disinfect.py
===================================================================
diff -u -r46fb3f18ae1a349eeb8bcc56d243618737ae3279 -r41b8ceb850aca652c0e060e8738027fc7aeb473c
--- dialin/dg/heat_disinfect.py	(.../heat_disinfect.py)	(revision 46fb3f18ae1a349eeb8bcc56d243618737ae3279)
+++ dialin/dg/heat_disinfect.py	(.../heat_disinfect.py)	(revision 41b8ceb850aca652c0e060e8738027fc7aeb473c)
@@ -24,9 +24,9 @@
     DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER = 11
     DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1 = 12
     DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS = 13
-    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1 = 14
-    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2 = 15
-    DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER = 16
+    DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER = 14
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1 = 15
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2 = 16
     DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2 = 17
     DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1 = 18
     DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION = 19
Index: tests/dg_heat_disinfect_test.py
===================================================================
diff -u -r46fb3f18ae1a349eeb8bcc56d243618737ae3279 -r41b8ceb850aca652c0e060e8738027fc7aeb473c
--- tests/dg_heat_disinfect_test.py	(.../dg_heat_disinfect_test.py)	(revision 46fb3f18ae1a349eeb8bcc56d243618737ae3279)
+++ tests/dg_heat_disinfect_test.py	(.../dg_heat_disinfect_test.py)	(revision 41b8ceb850aca652c0e060e8738027fc7aeb473c)
@@ -92,6 +92,7 @@
                     dg.ro_pump.measured_flow_rate_lpm))
     return info
 
+
 def get_heaters_info():
 
     info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_int_temp, {:5.3f}, Trimmer_DC, {:5.3f}, '.
@@ -127,17 +128,11 @@
     return info
 
 
-def actuate_valve():
-
-    dg.valves.cmd_valve_override(0, dg.valves.VALVE_RESERVOIR_DRAIN)
-    sleep(1)
-    dg.valves.cmd_valve_override(1, dg.valves.VALVE_RESERVOIR_DRAIN)
-
 def run_heat_disinfect():
 
     complete_counter = 1
-    f = open("Heat_disinfect.log", "w")
-    #dg.heat_disinfect.cmd_start_stop_heat_disinfect()
+    f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w")
+    dg.heat_disinfect.cmd_start_stop_heat_disinfect()
     try:
         while True:
 
@@ -156,8 +151,8 @@
             f.write(var)
             sleep(1)
 
-            # If the state is complete
-            if HeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name == 'DG_HEAT_DISINFECT_STATE_COMPLETE':
+            # If the mode came back to standby or standby solo
+            if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4:
                 # If it is the first call, stop heat disinfect
                 if complete_counter == 1:
                     dg.heat_disinfect.cmd_start_stop_heat_disinfect(start=False)