Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -ree0ca62a34e13183d43fb3830b774f3fed9989b6 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision ee0ca62a34e13183d43fb3830b774f3fed9989b6)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -20,7 +20,7 @@
 from collections import OrderedDict
 
 from .constants import NO_RESET
-from leahi_dialin.common.fp_defs import FPValveStates, FPValveNames, BETA_IOFP_VALVE_OFFSET
+from leahi_dialin.common.fp_defs import fp_enum_repository, BETA_IOFP_VALVE_OFFSET
 from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
@@ -62,19 +62,19 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_valves_states_data, self._handler_valves_sync)
 
         self.valve_states_all = 0x0000
-        self.m4_valv = {"id": FPValveNames.M4_VALV.value, "state": DEENERGIZED}
-        self.m12_valv = {"id": FPValveNames.M12_VALV.value, "state": DEENERGIZED}
-        self.p11_valv = {"id": FPValveNames.P11_VALV.value, "state": DEENERGIZED}
-        self.p33_valv = {"id": FPValveNames.P33_VALV.value, "state": DEENERGIZED}
-        self.p34_valv = {"id": FPValveNames.P34_VALV.value, "state": DEENERGIZED}
-        self.p37_valv = {"id": FPValveNames.P37_VALV.value, "state": DEENERGIZED}
-        self.p39_valv = {"id": FPValveNames.P39_VALV.value, "state": DEENERGIZED}
-        self.p6_valv = {"id": FPValveNames.P6_VALV.value, "state": DEENERGIZED}
+        self.m4_valv = {"id": fp_enum_repository.FPValveNames.M4_VALV.value, "state": DEENERGIZED}
+        self.m12_valv = {"id": fp_enum_repository.FPValveNames.M12_VALV.value, "state": DEENERGIZED}
+        self.p11_valv = {"id": fp_enum_repository.FPValveNames.P11_VALV.value, "state": DEENERGIZED}
+        self.p33_valv = {"id": fp_enum_repository.FPValveNames.P33_VALV.value, "state": DEENERGIZED}
+        self.p34_valv = {"id": fp_enum_repository.FPValveNames.P34_VALV.value, "state": DEENERGIZED}
+        self.p37_valv = {"id": fp_enum_repository.FPValveNames.P37_VALV.value, "state": DEENERGIZED}
+        self.p39_valv = {"id": fp_enum_repository.FPValveNames.P39_VALV.value, "state": DEENERGIZED}
+        self.p6_valv = {"id": fp_enum_repository.FPValveNames.P6_VALV.value, "state": DEENERGIZED}
 
         # NOTE: The len function counts the enums with the same number only once.
-        self.valve_states_enum = [0 for _ in range(len(FPValveNames))]
+        self.valve_states_enum = [0 for _ in range(len(fp_enum_repository.FPValveNames))]
 
-        for valve in FPValveNames.__members__:
+        for valve in fp_enum_repository.FPValveNames.__members__:
             self.valves_sensed_states[valve] = ''
 
     def get_valve_states(self):
@@ -137,7 +137,7 @@
         end = start + 1
         for valve_id in self.valves_sensed_states:
             valve_state_number = struct.unpack('B', bytearray(message['message'][start:end]))[0]
-            self.valves_sensed_states[valve_id] = FPValveStates(valve_state_number).name
+            self.valves_sensed_states[valve_id] = fp_enum_repository.FPValveStates(valve_state_number).name
             start = end
             end += 1