Index: tests/dg_heat_disinfect_test.py
===================================================================
diff -u -r94128c59d96218d3e1b3441f9e8cf9b6d77a4754 -r0035249fd22540886ba093c4e7dc72f9ba8c8353
--- tests/dg_heat_disinfect_test.py	(.../dg_heat_disinfect_test.py)	(revision 94128c59d96218d3e1b3441f9e8cf9b6d77a4754)
+++ tests/dg_heat_disinfect_test.py	(.../dg_heat_disinfect_test.py)	(revision 0035249fd22540886ba093c4e7dc72f9ba8c8353)
@@ -3,8 +3,8 @@
 import sys
 sys.path.append("..")
 from dialin.dg.dialysate_generator import DG
-from dialin.dg.heat_disinfection import HeatDisinfectionStates
-from dialin.dg.heat_disinfection import HeatDisinfectionInternalStates
+from dialin.dg.hd_proxy import DGHDProxy
+from dialin.dg.heat_disinfection import HeatDisinfectStates
 from dialin.dg.drain_pump import DrainPumpStates
 from dialin.dg.thermistors import Thermistors
 from dialin.dg.uv_reactors import ReactorsStates
@@ -21,7 +21,22 @@
     #sleep(1)
     #dg.thermistors.cmd_thermistors_value_override(52.2, ThermistorsNames.THERMISTOR_ONBOARD_NTC.value, reset=1)
     #sleep(2)
+    try:
+        #dg.hd_proxy.cmd_start_stop_dg(start=False)
+        #sleep(4)
+        dg.hd_proxy.cmd_start_stop_dg()
+        while True:
+            sleep(0.5)
+            print("Duty, {}, Pressure, {}, Flow, {}, state, {}".format(dg.ro_pump.pwm_duty_cycle_pct,
+                                                                       dg.pressures.ro_pump_outlet_pressure,
+                                                                       dg.ro_pump.measured_flow_rate_lpm,
+                                                                       dg.ro_pump.ro_pump_state))
+    except KeyboardInterrupt:
+        print('here')
+        dg.hd_proxy.cmd_start_stop_dg(start=False)
 
+
+    """"
     while True:
         sleep(0.5)
 
@@ -48,6 +63,7 @@
               dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INTERNAL_TDI_RTD.name],
               dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INTERNAL_COND_TEMP_SENSOR.name],
               dg.fans.inlet_1_rpm, dg.fans.inlet_2_rpm))
+    
 
     f = open("Heat_disinfection.txt", "w")
 
@@ -57,20 +73,20 @@
     #sleep(1)
     #dg.valves.cmd_valve_override(0, dg.valves.VALVE_RESERVOIR_OUTLET)
     #dg.valves.cmd_valve_override(1, dg.valves.VALVE_RESERVOIR_INLET)
-    dg.heat_disinfect.cmd_start_stop_heat_disinfection(start=False)
-    sleep(1)
-    time = 1
+    #dg.heat_disinfect.cmd_start_stop_heat_disinfection(start=False)
+    #sleep(1)
+    #time = 1
 
     dg.heat_disinfect.cmd_start_stop_heat_disinfection()
 
     try:
         while True:
-            """
+            
             var = ('Mode, {}, State, {}, Sub, {}, RO, {}, Drain, {}, VPi, {}, VBf, {}, VSP, {}, VPd, {}, VPo, {}, VDr, {}, '
                   'VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {}\r'
                                                         .format(dg.dg_operation_mode,
-                                                        HeatDisinfectionStates(dg.dg_operation_sub_mode).name,
-                                                        HeatDisinfectionInternalStates(dg.heat_disinfect.internal_state).name,
+                                                        HeatDisinfectStates(dg.dg_operation_sub_mode).name,
+                                                        HeatDisinfectionInternalStates(dg.heat_disinfect.current_state).name,
                                                         dg.ro_pump.ro_pump_state,
                                                         DrainPumpStates(dg.drain_pump.drain_pump_state).name,
                                                         dg.valves.valve_states_enum[dg.valves.VALVE_PRESSURE_INLET],
@@ -84,13 +100,12 @@
                                                         dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN],
                                                         dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_INLET],
                                                         dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_FILL]))
-            """
-            var = ('Mode, {}, State, {}, Sub, {}, RO, {}, Flow, {:5.3f}, TgtPres, {:5.3f}, InletPres, {:5.3f}, '
+            
+            var = ('Mode, {}, State, {}, RO, {}, Flow, {:5.3f}, TgtPres, {:5.3f}, InletPres, {:5.3f}, '
                    'OutletPres, {:5.3f}, PWM, {:5.3f}, Drain, {}, DInletPres, {:5.3f}, DOutletPres, {:5.3f}, '
                    'DrainDAC, {:5.3f}, R1, {:5.3f}, R2, {:5.3f}, TPi, {:5.3f}, TPo, {:5.3f}, TDi, {:5.3f} \r'
                                             .format(dg.dg_operation_mode,
                                             HeatDisinfectionStates(dg.dg_operation_sub_mode).name,
-                                            HeatDisinfectionInternalStates(dg.heat_disinfect.internal_state).name,
                                             dg.ro_pump.ro_pump_state,
                                             dg.ro_pump.measured_flow_rate_lpm,
                                             dg.ro_pump.target_pressure_psi,
@@ -108,7 +123,10 @@
             print(var)
             f.write(var)
             sleep(0.25)
-
+      
+    
     except KeyboardInterrupt:
+        dg.hd_proxy.cmd_start_stop_dg(start=False)
         dg.heat_disinfect.cmd_start_stop_heat_disinfection(start=False)
         f.close()
+    """""
\ No newline at end of file