Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -r38e8dd31728056dbb7f9304c98ab16d7147b75a2
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2)
@@ -19,7 +19,7 @@
 from collections import OrderedDict
 
 from leahi_dialin.common.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.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
@@ -59,19 +59,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] = ''
 
 
@@ -165,7 +165,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
 
@@ -210,7 +210,7 @@
         vlv = integer_to_bytearray(valve)
         payload = rst + ste + vlv
 
-        valve_name = FPValveNames(valve).name.split('_')[0]
+        valve_name = fp_enum_repository.FPValveNames(valve).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -230,7 +230,7 @@
             Given valve ID must be one of the valve IDs listed below.
 
         @param valve:  unsigned int - valve ID
-        @param state:  int - valve state
+        @param state:  int - valve state  (0=de-energized/closed, 1=energized/open)
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
@@ -239,7 +239,7 @@
         vlv = integer_to_bytearray(valve + BETA_IOFP_VALVE_OFFSET)
         payload = rst + ste + vlv
 
-        valve_name = FPValveNames(valve).name.split('_')[0]
+        valve_name = fp_enum_repository.FPValveNames(valve).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,