Index: tests/dg_tests.py
===================================================================
diff -u -r27872ba051da5230041de569fc817d3c00a5ddb0 -r57d4a1ed94cf53c849ab9ae5c729c0ba29234aaf
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 27872ba051da5230041de569fc817d3c00a5ddb0)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 57d4a1ed94cf53c849ab9ae5c729c0ba29234aaf)
@@ -8,7 +8,7 @@
 # @file    dg_tests.py
 #
 # @author  (last)      Dara Navaei
-# @date    (last)      27-Mar-2023
+# @date    (last)      26-Apr-2023
 # @author  (original)  Dara Navaei
 # @date    (original)  16-Jan-2022
 #
@@ -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
@@ -48,6 +48,7 @@
 from dialin.hd.voltages import HDMonitoredVoltages
 from dialin.hd.pretreatment import PreTreatmentRsrvrState
 from dialin.common.dg_defs import DGFlushStates, DGHeatDisinfectActiveCoolStates
+from dialin.common.test_config_defs import DGTestConfigOptions, HDTestConfigOptions
 from time import sleep
 from datetime import datetime
 import sys
@@ -151,9 +152,9 @@
 
 
 def get_hd_occlusion_pressures_info():
-    info = ('Art_pres, {:5.3f}, Venous_pres, {:5.3f}, Blood_pump_pres, {:5.3f}, DialIn_pres, {}, DialOut_pres, {}, '
+    info = ('Art_pres, {:5.3f}, Venous_pres, {:5.3f}, Blood_pump_pres, {:5.3f}, DialOut_pres, {}, '
             .format(hd.pressure_occlusion.arterial_pressure, hd.pressure_occlusion.venous_pressure,
-                    hd.pressure_occlusion.blood_pump_occlusion, hd.pressure_occlusion.dialysate_inlet_pump_occlusion,
+                    hd.pressure_occlusion.blood_pump_occlusion,
                     hd.pressure_occlusion.dialysate_outlet_pump_occlusion))
     return info
 
@@ -208,12 +209,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 +387,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
@@ -491,7 +501,7 @@
             idle_bad_fill = '0,' #get_dg_idle_bad_fill_info()
             uv = get_uv_reactors_info()
             hd_fans = get_hd_fans_info()
-            hd_pressures = get_hd_occlusion_pressures_info()
+            hd_pressures = '0' #get_hd_occlusion_pressures_info()
             air_trap = get_hd_air_trap_info()
 
             var = str(datetime.now()) + ', ' + hd_run + dg_run + hd_rsrvrs + dg_rsrvrs + load_cell + drain + ro + \
@@ -512,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:
@@ -661,7 +671,20 @@
     hd = HD(log_level='DEBUG')
     hd.cmd_log_in_to_hd()
     sleep(1)
+    """
+    print(dg.test_configs.dg_test_configs)
+    print(hex(dg.test_configs.cmd_get_test_config_status(DGTestConfigOptions.TEST_CONFIG_ENABLE_MIXING_WITH_WATER.value)))
 
+    dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_ENABLE_MIXING_WITH_WATER.value, reset=0)
+    sleep(1)
+    """
+    dg.test_configs.cmd_request_test_config_status_from_fw()
+
+    while True:
+        print(hex(dg.test_configs.cmd_get_test_config_status(
+            DGTestConfigOptions.TEST_CONFIG_ENABLE_MIXING_WITH_WATER.value)))
+        sleep(1)
+
     #run_heat_disinfect()
 
     #run_flush_mode()
@@ -674,7 +697,7 @@
 
     # cmd_set_disinfect_ui_screen()
 
-    #collect_treatment_data()
+    collect_treatment_data()
 
     #collect_hd_treatment()
 
@@ -696,10 +719,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)