Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d)
@@ -19,7 +19,7 @@
 from collections import OrderedDict
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.dd_defs import DDValveNames
+from leahi_dialin.common.dd_defs import dd_enum_repository
 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
@@ -63,46 +63,46 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_valves_states_data, self._handler_valves_sync)
 
         self.valve_states_all = 0x00000000
-        self.d14_valv = {"id": DDValveNames.D14_VALV.value, "state": DEENERGIZED}
-        self.d52_valv = {"id": DDValveNames.D52_VALV.value, "state": DEENERGIZED}
-        self.d8_valv = {"id": DDValveNames.D8_VALV.value, "state": DEENERGIZED}
-        self.d54_valv = {"id": DDValveNames.D54_VALV.value, "state": DEENERGIZED}
-        self.d53_valv = {"id": DDValveNames.D53_VALV.value, "state": DEENERGIZED}
-        self.d34_valv = {"id": DDValveNames.D34_VALV.value, "state": DEENERGIZED}
-        self.d64_valv = {"id": DDValveNames.D64_VALV.value, "state": DEENERGIZED}
-        self.d31_valv = {"id": DDValveNames.D31_VALV.value, "state": DEENERGIZED}
-        self.d65_valv = {"id": DDValveNames.D65_VALV.value, "state": DEENERGIZED}
-        self.d35_valv = {"id": DDValveNames.D35_VALV.value, "state": DEENERGIZED}
-        self.d40_valv = {"id": DDValveNames.D40_VALV.value, "state": DEENERGIZED}
-        self.d47_valv = {"id": DDValveNames.D47_VALV.value, "state": DEENERGIZED}
-        self.d3_valv = {"id": DDValveNames.D3_VALV.value, "state": DEENERGIZED}
-        self.d80_valv = {"id": DDValveNames.D80_VALV.value, "state": DEENERGIZED}
-        self.d81_valv = {"id": DDValveNames.D81_VALV.value, "state": DEENERGIZED}
-        self.rsvrd1 = {"id": DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED}
+        self.d14_valv = {"id": dd_enum_repository.DDValveNames.D14_VALV.value, "state": DEENERGIZED}
+        self.d52_valv = {"id": dd_enum_repository.DDValveNames.D52_VALV.value, "state": DEENERGIZED}
+        self.d8_valv = {"id": dd_enum_repository.DDValveNames.D8_VALV.value, "state": DEENERGIZED}
+        self.d54_valv = {"id": dd_enum_repository.DDValveNames.D54_VALV.value, "state": DEENERGIZED}
+        self.d53_valv = {"id": dd_enum_repository.DDValveNames.D53_VALV.value, "state": DEENERGIZED}
+        self.d34_valv = {"id": dd_enum_repository.DDValveNames.D34_VALV.value, "state": DEENERGIZED}
+        self.d64_valv = {"id": dd_enum_repository.DDValveNames.D64_VALV.value, "state": DEENERGIZED}
+        self.d31_valv = {"id": dd_enum_repository.DDValveNames.D31_VALV.value, "state": DEENERGIZED}
+        self.d65_valv = {"id": dd_enum_repository.DDValveNames.D65_VALV.value, "state": DEENERGIZED}
+        self.d35_valv = {"id": dd_enum_repository.DDValveNames.D35_VALV.value, "state": DEENERGIZED}
+        self.d40_valv = {"id": dd_enum_repository.DDValveNames.D40_VALV.value, "state": DEENERGIZED}
+        self.d47_valv = {"id": dd_enum_repository.DDValveNames.D47_VALV.value, "state": DEENERGIZED}
+        self.d3_valv = {"id": dd_enum_repository.DDValveNames.D3_VALV.value, "state": DEENERGIZED}
+        self.d80_valv = {"id": dd_enum_repository.DDValveNames.D80_VALV.value, "state": DEENERGIZED}
+        self.d81_valv = {"id": dd_enum_repository.DDValveNames.D81_VALV.value, "state": DEENERGIZED}
+        self.rsvrd1 = {"id": dd_enum_repository.DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED}
 
-        self.d23_valv = {"id": DDValveNames.D23_VALV.value, "state": DEENERGIZED}
-        self.d19_valv = {"id": DDValveNames.D19_VALV.value, "state": DEENERGIZED}
-        self.d25_valv = {"id": DDValveNames.D25_VALV.value, "state": DEENERGIZED}
-        self.d21_valv = {"id": DDValveNames.D26_VALV.value, "state": DEENERGIZED}
-        self.d24_valv = {"id": DDValveNames.D24_VALV.value, "state": DEENERGIZED}
-        self.d20_valv = {"id": DDValveNames.D20_VALV.value, "state": DEENERGIZED}
-        self.d26_valv = {"id": DDValveNames.D21_VALV.value, "state": DEENERGIZED}
-        self.d22_valv = {"id": DDValveNames.D22_VALV.value, "state": DEENERGIZED}
+        self.d23_valv = {"id": dd_enum_repository.DDValveNames.D23_VALV.value, "state": DEENERGIZED}
+        self.d19_valv = {"id": dd_enum_repository.DDValveNames.D19_VALV.value, "state": DEENERGIZED}
+        self.d25_valv = {"id": dd_enum_repository.DDValveNames.D25_VALV.value, "state": DEENERGIZED}
+        self.d21_valv = {"id": dd_enum_repository.DDValveNames.D26_VALV.value, "state": DEENERGIZED}
+        self.d24_valv = {"id": dd_enum_repository.DDValveNames.D24_VALV.value, "state": DEENERGIZED}
+        self.d20_valv = {"id": dd_enum_repository.DDValveNames.D20_VALV.value, "state": DEENERGIZED}
+        self.d26_valv = {"id": dd_enum_repository.DDValveNames.D21_VALV.value, "state": DEENERGIZED}
+        self.d22_valv = {"id": dd_enum_repository.DDValveNames.D22_VALV.value, "state": DEENERGIZED}
 
-        self.d79_pmp_valv = {"id": DDValveNames.D79_PMP_VALV.value, "state": DEENERGIZED}
-        self.d83_valv = {"id": DDValveNames.D83_VALV.value, "state": DEENERGIZED}
-        self.d91_valv = {"id": DDValveNames.D91_VALV.value, "state": DEENERGIZED}
-        self.spare3_valv = {"id": DDValveNames.SPARE3_VALV.value, "state": DEENERGIZED}
-        self.spare4_valv = {"id": DDValveNames.SPARE4_VALV.value, "state": DEENERGIZED}
-        self.spare5_valv = {"id": DDValveNames.SPARE5_VALV.value, "state": DEENERGIZED}
-        self.d100_valv = {"id": DDValveNames.D100_VALV.value, "state": DEENERGIZED}
-        self.spare7_valv = {"id": DDValveNames.SPARE7_VALV.value, "state": DEENERGIZED}
+        self.d79_pmp_valv = {"id": dd_enum_repository.DDValveNames.D79_PMP_VALV.value, "state": DEENERGIZED}
+        self.d83_valv = {"id": dd_enum_repository.DDValveNames.D83_VALV.value, "state": DEENERGIZED}
+        self.d91_valv = {"id": dd_enum_repository.DDValveNames.D91_VALV.value, "state": DEENERGIZED}
+        self.spare3_valv = {"id": dd_enum_repository.DDValveNames.SPARE3_VALV.value, "state": DEENERGIZED}
+        self.spare4_valv = {"id": dd_enum_repository.DDValveNames.SPARE4_VALV.value, "state": DEENERGIZED}
+        self.spare5_valv = {"id": dd_enum_repository.DDValveNames.SPARE5_VALV.value, "state": DEENERGIZED}
+        self.d100_valv = {"id": dd_enum_repository.DDValveNames.D100_VALV.value, "state": DEENERGIZED}
+        self.spare7_valv = {"id": dd_enum_repository.DDValveNames.SPARE7_VALV.value, "state": DEENERGIZED}
 
         # NOTE: The len function counts the enums with the same number only once. This is not the case in the DD valves
         # class because each valve must have a unique ID.
-        self.valve_states_enum = [0 for _ in range(len(DDValveNames))]
+        self.valve_states_enum = [0 for _ in range(len(dd_enum_repository.DDValveNames))]
 
-        for valve in DDValveNames.__members__:
+        for valve in dd_enum_repository.DDValveNames.__members__:
             self.valves_sensed_states[valve] = ''
 
 
@@ -271,7 +271,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] = DDValveNames(valve_state_number).name
+            self.valves_sensed_states[valve_id] = dd_enum_repository.DDValveNames(valve_state_number).name
             start = end
             end += 1
 
@@ -316,7 +316,7 @@
         vlv = integer_to_bytearray(valve)
         payload = rst + ste + vlv
 
-        valve_name = DDValveNames(valve).name.split('_')[0]
+        valve_name = dd_enum_repository.DDValveNames(valve).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -345,7 +345,7 @@
         vlv = integer_to_bytearray(valve)
         payload = rst + ste + vlv
 
-        valve_name = DDValveNames(valve).name.split('_')[0]
+        valve_name = dd_enum_repository.DDValveNames(valve).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -419,7 +419,7 @@
         sts = integer_to_bytearray(state)
         payload = vlv + sts
 
-        valve_name = DDValveNames(valve).name.split('_')[0]
+        valve_name = dd_enum_repository.DDValveNames(valve).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,