Index: tests/dg_tests.py
===================================================================
diff -u -r2822dd09b581cd823bb8f673e3665931c4221567 -r87dc9906f3c7002181ab9366bf6f7761a5462e78
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 2822dd09b581cd823bb8f673e3665931c4221567)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 87dc9906f3c7002181ab9366bf6f7761a5462e78)
@@ -28,14 +28,16 @@
 from dialin.hd.temperatures import HDTemperaturesNames
 from dialin.dg.concentrate_pumps import DGConcentratePumpsStates
 from dialin.dg.uv_reactors import ReactorsNames
-from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PreTreatmentWetSelfTesStates
+from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PreTreatmentWetSelfTesStates, PostTreatmentStates
+from dialin.hd.post_treatment import HDPostTreatmentDrainStates
 from dialin.common.dg_defs import DGEventList
 from dialin.common.hd_defs import HDEventList
 from dialin.hd.reservoirs import HDReservoirStates
 from dialin.dg.reservoirs import DGReservoirsNames
 from dialin.common.dg_defs import DGGenIdleModeBadFillSubStates
 from dialin.common.alarm_defs import AlarmList
 from dialin.dg.fans import DGFansNames
+from dialin.dg.pressures import DGPressures
 from dialin.dg.conductivity_sensors import ConductivitySensorsEnum
 from time import sleep
 from datetime import datetime
@@ -72,11 +74,13 @@
 
 def get_hd_run_info():
     info = ('HD_op_mode, {}, HD_sub_mode, {}, Top_alarm, {}, Target_UF_ml, {:5.3f}, Meas_UF_ml, {:5.3f}, '
-            'Wet_test_state, {}, '
+            'Wet_test_state, {}, Post_tx_state, {}, Post_tx_drain_state, {}, '
             .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))
+                    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
 
 
@@ -350,15 +354,18 @@
 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.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)
 
+    counter = 1
     start = False
+    """
 
     try:
         while True:
@@ -379,16 +386,29 @@
             fill_info = get_dg_fill_info()
             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 + '\r'
-
+            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'
+            """
             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
+
+                if 10 < counter < 14:
+                    dg.pressures.cmd_pressure_override(dg.pressures.PRESSURE_SENSOR_RO_PUMP_INLET, 14, reset=1)
+            """
             print(var)
             f.write(var)
             sleep(1)
@@ -614,3 +634,4 @@
     # test_hd_fans_alarms()
 
     # test_dg_fans_alarms()
+