Index: tests/dg_tests.py
===================================================================
diff -u -refe86762ff1719353641a9399b4540adf43d0a50 -r58c7a201f72bcb7501b1c88e0027ee0bc8415583
--- tests/dg_tests.py	(.../dg_tests.py)	(revision efe86762ff1719353641a9399b4540adf43d0a50)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 58c7a201f72bcb7501b1c88e0027ee0bc8415583)
@@ -41,6 +41,7 @@
 from dialin.dg.pressures import DGPressures
 from dialin.dg.conductivity_sensors import ConductivitySensorsEnum
 from dialin.dg.voltages import DGMonitoredVoltages
+from dialin.dg.valves import DGValveNames
 from dialin.hd.valves import HDValves
 from dialin.hd.voltages import HDMonitoredVoltages
 from dialin.hd.pretreatment import PreTreatmentRsrvrState
@@ -140,21 +141,20 @@
 
 
 def get_dg_valves_states():
-    info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {}, '
+    info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRi, {}, VRf, {}, '
             'VRD1, {}, VRD2, {}, '
-            .format(dg.valves.valve_states_enum[dg.valves.VALVE_PRESSURE_INLET],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_SAMPLING_PORT],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_PRODUCTION_DRAIN],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_BYPASS_FILTER],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_PRESSURE_OUTLET],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_DRAIN],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_RECIRCULATE],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_OUTLET],
-                    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],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_1],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_2]))
+            .format(dg.valves.valve_states_enum[DGValveNames.VALVE_PRESSURE_INLET.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_SAMPLING_PORT.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_PRODUCTION_DRAIN.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_BYPASS_FILTER.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_PRESSURE_OUTLET.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_DRAIN.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_RECIRCULATE.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_RESERVOIR_OUTLET.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_RESERVOIR_INLET.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_RESERVOIR_FILL.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_RESERVOIR_DRAIN_1.value],
+                    dg.valves.valve_states_enum[DGValveNames.VALVE_RESERVOIR_DRAIN_2.value]))
     return info
 
 
@@ -703,7 +703,8 @@
     #collect_hd_treatment()
 
     while True:
-        print(get_hd_fans_info(), get_dg_fans_info(), get_temperature_sensors_info())
+        #print(get_hd_fans_info(), get_dg_fans_info(), get_temperature_sensors_info())
+        print(get_dg_valves_states())
         sleep(1)
 
     #while True: