Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r9f947930678d5b13aa8f788f4e3d58cd1370a541
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 9f947930678d5b13aa8f788f4e3d58cd1370a541)
@@ -99,12 +99,13 @@
         self.spare7_valv = {"id": dd_enum_repository.DDValveNames.SPARE7_VALV.value, "state": DEENERGIZED}      #: The Spare7 valve's value
 
         #: States of all the vales in list format
-        self.valve_states_enum = [0 for _ in range(dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value - 1)]
+        self.valve_states_enum = {}
+        for i in range(0, dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value):
+            valve_name = dd_enum_repository.DDValveNames(i).name.split('_')[0]
+            self.valve_states_enum[valve_name] = 0
+            self.valves_sensed_states[valve_name] = ''
 
-        for valve in dd_enum_repository.DDValveNames.__members__:
-            self.valves_sensed_states[valve] = ''
 
-
     def get_valve_states(self):
         """
         Gets the valve states
@@ -267,8 +268,9 @@
         self.spare7_valv["state"] = self._binary_to_valve_state(spv[0] & 128)
 
         # Updating Valve_states_enum
-        for i in range(0, dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value - 1):
-            self.valve_states_enum[i] = eval(f'self.{dd_enum_repository.DDValveNames(i).name.lower()}["state"]')
+        for i in range(0, dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value):
+            valve_name = dd_enum_repository.DDValveNames(i).name.split('_')[0]
+            self.valve_states_enum[valve_name] = eval(f'self.{dd_enum_repository.DDValveNames(i).name.lower()}["state"]')
 
         start = self.END_POS_SPARE_VALVES_STATES
         end = start + 1