Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -r175101bed0d998f3e0c6ff24d90603acb0106e4d -rd27c40205e18118f4689f62463a266da1f91dba6
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 175101bed0d998f3e0c6ff24d90603acb0106e4d)
+++ leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision d27c40205e18118f4689f62463a266da1f91dba6)
@@ -21,7 +21,7 @@
 
 from .constants import NO_RESET
 from leahi_dialin.common import MsgIds
-from leahi_dialin.common.td_defs import TDValvesEnum, TDValvesPositions, TDValvesStates
+from leahi_dialin.common.td_defs import td_enum_repository
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -80,8 +80,8 @@
 
         self.td_valves_timestamp = 0.0
         # A dictionary of the valves with the status
-        self.valves_status = {TDValvesEnum.H1_VALV.name: {},
-                              TDValvesEnum.H19_VALV.name: {}}
+        self.valves_status = {td_enum_repository.TDValveNames.H1_VALV.name: {},
+                              td_enum_repository.TDValveNames.H19_VALV.name: {}}
 
     @publish(["msg_id_td_valves_data", "valves_status", "td_valves_timestamp"])
     def _handler_valves_sync(self, message: dict, timestamp=0.0) -> None:
@@ -111,11 +111,11 @@
             message['message'][self.START_MAX_HOMING_ENC:self.END_MAX_HOMING_ENC]))[0]
 
         # To make sure values of the enums are not out of range
-        if TDValvesEnum.has_value(vlv_id) and TDValvesPositions.has_value(pos_id) and TDValvesStates.has_value(pos_id):
-            vlv_name = TDValvesEnum(vlv_id).name
+        if td_enum_repository.TDValveNames.has_value(vlv_id) and td_enum_repository.TDValvePositions.has_value(pos_id) and td_enum_repository.TDValveStates.has_value(pos_id):
+            vlv_name = td_enum_repository.TDValveNames(vlv_id).name
             # Update the valves dictionary
-            self.valves_status[vlv_name] = {'Valve': vlv_name, 'PosID': TDValvesPositions(pos_id).name, 'PosCnt': pos_cnt,
-                                            'Cmd': cmd_pos, 'State': TDValvesStates(state_id).name, 'PosA': pos_a,
+            self.valves_status[vlv_name] = {'Valve': vlv_name, 'PosID': td_enum_repository.TDValvePositions(pos_id).name, 'PosCnt': pos_cnt,
+                                            'Cmd': cmd_pos, 'State': td_enum_repository.TDValveStates(state_id).name, 'PosA': pos_a,
                                             'PosB': pos_b, 'PosC': pos_c, 'PosD': pos_d, 'Max_homing_enc': max_homing_enc}
         self.td_valves_timestamp = timestamp
 
@@ -157,8 +157,8 @@
         """
         Constructs and sends the TD valves set position for a valve
 
-        @param valve: integer - Valve number. Defined in TDValvesEnum class
-        @param position: integer - Position number: Defined in TDValvesPositions class
+        @param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class
+        @param position: integer - Position number: Defined in td_enum_repository.TDValvePositions class
         @returns 1 if successful, zero otherwise
         """
 
@@ -184,7 +184,7 @@
         """
         Constructs and sends the TD valves home command
 
-        @param valve: integer - Valve number. Defined in TDValvesEnum class
+        @param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class
         @param force_home: integer - 1 to force valve to home position, 0 for normal homing
         @param cartridge: integer - 1 to use cartridge settings, 0 to use settings for system use without cartridge
         @returns 1 if successful, zero otherwise
@@ -211,7 +211,7 @@
         """
         Constructs and sends the TD valves set position for a valve
 
-        @@param valve: integer - Valve number. Defined in TDValvesEnum class
+        @@param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class
         @param position_count: integer value
         @param reset: integer - 1 to reset a previous override, 0 to override
         @returns 1 if successful, zero otherwise
@@ -230,7 +230,7 @@
         # If there is content...
         if received_message is not None:
 
-            self.logger.debug("Setting {} position to {} ".format(str(TDValvesEnum(valve).name), position_count))
+            self.logger.debug("Setting {} position to {} ".format(str(td_enum_repository.TDValveNames(valve).name), position_count))
 
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
@@ -242,7 +242,7 @@
         """
         Constructs and sends the TD valves set position for a valve
 
-        @@param valve: integer - Valve number. Defined in TDValvesEnum class
+        @@param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class
         @param status: integer value
         @param reset: integer - 1 to reset a previous override, 0 to override
         @returns 1 if successful, zero otherwise
@@ -261,7 +261,7 @@
         # If there is content...
         if received_message is not None:
 
-            self.logger.debug("Setting {} status to {} ".format(str(TDValvesEnum(valve).name), status))
+            self.logger.debug("Setting {} status to {} ".format(str(td_enum_repository.TDValveNames(valve).name), status))
 
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
@@ -274,7 +274,7 @@
         Constructs and sends a given valve to change position by a
         given number of encoder counts.
 
-        @@param valve: integer - Valve number. Defined in TDValvesEnum class
+        @@param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class
         @param count: integer value
         @returns 1 if successful, zero otherwise
         """
@@ -291,7 +291,7 @@
         # If there is content...
         if received_message is not None:
 
-            self.logger.debug("Setting {} position by {} ".format(str(TDValvesEnum(valve).name), counts))
+            self.logger.debug("Setting {} position by {} ".format(str(td_enum_repository.TDValveNames(valve).name), counts))
 
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]