Index: tests/dg_tests.py
===================================================================
diff -u -r821d2c94ccc6542a7733a9453e59b751bfd0ef75 -r783b4a4b4a44ac1ce5518701e893d6f434116b02
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 821d2c94ccc6542a7733a9453e59b751bfd0ef75)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 783b4a4b4a44ac1ce5518701e893d6f434116b02)
@@ -23,7 +23,7 @@
 from dialin.common.dg_defs import DGChemicalDisinfectStates, DGChemDisinfectUIStates
 from dialin.common.dg_defs import DGChemDisinfectFlushStates, DGChemDisinfectFlushUIStates
 from dialin.dg.chemical_disinfect import ChemCancellationModes
-from dialin.dg.drain_pump import DrainPumpStates
+from dialin.dg.drain_pump import DrainPumpStates, DrainPumpRPMFeedBackSensors
 from dialin.dg.thermistors import ThermistorsNames
 from dialin.dg.temperatures import DGTemperaturesNames
 from dialin.dg.dialysate_generator import DGOperationModes
@@ -208,12 +208,14 @@
 
 def get_drain_states_info():
     info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, Baro, {:5.3f}, '
-            'Drain_curr_A, {:5.3f}, Drain_dir, {}, Target_flow_lpm, {:5.3f}, '
+            'Drain_curr_A, {:5.3f}, Drain_dir, {}, Target_flow_lpm, {:5.3f}, Maxon_rpm, {}, '
             .format(DrainPumpStates(dg.drain_pump.drain_pump_state).name, dg.drain_pump.dac_value,
-                    dg.drain_pump.target_drain_pump_rpm, dg.drain_pump.current_drain_pump_rpm,
+                    dg.drain_pump.target_drain_pump_rpm,
+                    dg.drain_pump.current_drain_pump_rpm[DrainPumpRPMFeedBackSensors.DRAIN_PUMP_HALL_SNSR_FB.name],
                     dg.pressures.drain_pump_inlet_pressure, dg.pressures.drain_pump_outlet_pressure,
                     dg.pressures.barometric_pressure, dg.drain_pump.drain_pump_current_A,
-                    dg.drain_pump.drain_pump_direction, dg.drain_pump.target_drain_pump_outlet_flow_lpm))
+                    dg.drain_pump.drain_pump_direction, dg.drain_pump.target_drain_pump_outlet_flow_lpm,
+                    dg.drain_pump.current_drain_pump_rpm[DrainPumpRPMFeedBackSensors.DRAIN_PUMP_MAXON_SNSR_FB.name]))
     return info
 
 
@@ -384,6 +386,13 @@
     return info
 
 
+def get_dg_voltages_info():
+    info = ('DG_24, {:5.3f}, DG_24_non-iso, {:5.3f}, '.
+            format(dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_MAIN.value],
+                   dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_NON_ISOLATED_24_V_MAIN.value]))
+    return info
+
+
 def run_dg():
     counter = 1
     timer = 0.1
@@ -513,8 +522,8 @@
     f = open(address, "w")
     #dg.heaters.cmd_heaters_broadcast_interval_override(50)
     #sleep(1)
-    #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect()
-    dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool()
+    dg.hd_proxy.cmd_start_stop_dg_heat_disinfect()
+    #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool()
 
     try:
         while True:
@@ -663,7 +672,7 @@
     hd.cmd_log_in_to_hd()
     sleep(1)
 
-    #run_heat_disinfect()
+    run_heat_disinfect()
 
     #run_flush_mode()
 
@@ -697,10 +706,10 @@
 
     #hd.cmd_hd_software_reset_request()
 
-    hd.ui.cmd_set_ro_only_mode_status(1)
+    #hd.ui.cmd_set_ro_only_mode_status(1)
 
-    while True:
-        print(dg.dialysate_fill.ro_only_mode_status)
-        sleep(1)
+    #while True:
+    #    print(get_dg_voltages_info())
+    #    sleep(1)