Index: tests/dg_tests.py
===================================================================
diff -u -r87dc9906f3c7002181ab9366bf6f7761a5462e78 -reee8d5cd603ee99c3bc823d014aaaa2069ce524c
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 87dc9906f3c7002181ab9366bf6f7761a5462e78)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision eee8d5cd603ee99c3bc823d014aaaa2069ce524c)
@@ -39,6 +39,7 @@
 from dialin.dg.fans import DGFansNames
 from dialin.dg.pressures import DGPressures
 from dialin.dg.conductivity_sensors import ConductivitySensorsEnum
+from dialin.dg.voltages import DGMonitoredVoltages
 from time import sleep
 from datetime import datetime
 import sys
@@ -78,7 +79,7 @@
             .format(HDOpModes(hd.hd_operation_mode).name, hd.hd_operation_sub_mode, hd.alarms.alarm_top,
                     hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume,
                     hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume,
-                    PreTreatmentWetSelfTesStates(hd.pretreatment.pre_treatment_wet_self_test_state).name,
+                    0, #PreTreatmentWetSelfTesStates(hd.pretreatment.pre_treatment_wet_self_test_state).name,
                     PostTreatmentStates(hd.post_treatment.post_treatment_sub_mode).name,
                     HDPostTreatmentDrainStates(hd.post_treatment.post_treatment_drain_state).name))
     return info
@@ -185,12 +186,14 @@
 def get_heaters_info():
     info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trimmer_state, {}, '
             'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, Dia_flow, {:5.3f}, '
-            'Interim_int_temp, {:5.3f}, Heater_RO_flow, {:5.3f}, '.
+            'Interim_int_temp, {:5.3f}, Heater_RO_flow, {:5.3f}, Primary_volt, {:5.3f}, Trimmer_volt, {:5.3f}, '.
             format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.primary_heater_state,
                    dg.heaters.trimmer_heater_duty_cycle, dg.heaters.trimmer_heater_state,
                    dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature,
                    dg.heaters.primary_efficiency, dg.heaters.temporary_remove_flow,
-                   dg.heaters.temporary_internal_target, dg.heaters.temporary_target_ro_flow))
+                   dg.heaters.temporary_internal_target, dg.heaters.temporary_target_ro_flow,
+                   dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value],
+                   dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value]))
     return info
 
 
@@ -353,19 +356,17 @@
 
 def collect_treatment_data():
     f = open("/home/fw/projects/dialin/tests/treatment_run.log", "w")
-
     """
     dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD2.value, 6900.00)
     sleep(1)
     dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD1.value, 12100.00)
     sleep(1)
 
-    #dg.dialysate_fill.cmd_used_bicarb_volume_override(3700.0)
-    #sleep(1)
-
+    dg.dialysate_fill.cmd_used_bicarb_volume_override(3700.0)
+    sleep(1)
+    """
     counter = 1
     start = False
-    """
 
     try:
         while True:
@@ -387,21 +388,22 @@
             idle_bad_fill = get_dg_idle_bad_fill_info()
 
             var = str(datetime.now()) + ', ' + hd_run + dg_run + hd_rsrvrs + dg_rsrvrs + load_cell + drain + ro + \
-                temp + heaters + conc_pumps + dg_fans + valves + blood_leak + hd_pumps + fill_info + '\r'
-            """
+              temp + heaters + conc_pumps + dg_fans + valves + blood_leak + hd_pumps + fill_info + idle_bad_fill + '\r'
+
+            if hd.alarms.get_alarm_state(97) and start is False:
+                dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD2.value, 13700.00)
+                sleep(0.2)
+                dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD1.value, 11600.00)
+                start = True
+
+            """          
             var = str(datetime.now()) + ', ' + hd_run + dg_run + load_cell + drain + ro + conc_pumps + valves + \
                   idle_bad_fill + fill_info + '\r'
 
-<<<<<<< HEAD
-            #if dg.dg_operation_mode == 6 and dg.dg_operation_sub_mode == 5 and start is False:
-            #    dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD2.value, 12000.00)
-            #    start = True
-=======
             if dg.dg_operation_mode == 6 and dg.dg_operation_sub_mode == 4 and start is False:
                 #dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD2.value, 12000.00)
                 dg.pressures.cmd_pressure_override(dg.pressures.PRESSURE_SENSOR_RO_PUMP_INLET, 14)
                 start = True
->>>>>>> DEN-12224-dg_hd_dev-switches-monitor
 
             if start is True:
                 counter += 1
@@ -420,7 +422,7 @@
 def collect_hd_treatment():
     f = open("/home/fw/projects/dialin/tests/treatment_run_hd.log", "w")
 
-    hd.cmd_hd_software_reset_request()
+    #hd.cmd_hd_software_reset_request()
 
     try:
         while True:
@@ -619,19 +621,24 @@
     hd.cmd_log_in_to_hd()
     sleep(1)
 
-    # run_heat_disinfect()
+    #run_heat_disinfect()
 
     # run_chemical_disinfect()
 
     # run_dg()
 
     # cmd_set_disinfect_ui_screen()
 
-    collect_treatment_data()
+    #collect_treatment_data()
 
-    # collect_hd_treatment()
+    #collect_hd_treatment()
 
     # test_hd_fans_alarms()
 
     # test_dg_fans_alarms()
+    while True:
+        print(get_hd_fans_info())
+        sleep(1)
 
+    #dg.ro_pump.cmd_ro_pump_measured_flow_rate_override(0.0, reset=1)
+