Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -rfd7b62032ac50f7ce1026d4e22ea83f6271b812c -r52aa7af16b98730ba59fc2577dbe8f73b5959775
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision fd7b62032ac50f7ce1026d4e22ea83f6271b812c)
+++ leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 52aa7af16b98730ba59fc2577dbe8f73b5959775)
@@ -21,7 +21,7 @@
 
 from .constants import NO_RESET
 from leahi_dialin.common import MsgIds
-from leahi_dialin.common.td_defs import ValvesEnum, ValvesPositions, ValvesStates
+from leahi_dialin.common.td_defs import TDValvesEnum, TDValvesPositions, TDValvesStates
 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
@@ -70,8 +70,8 @@
 
         self.td_valves_timestamp = 0.0
         # A dictionary of the valves with the status
-        self.valves_status = {ValvesEnum.H1_VALV.name: {},
-                              ValvesEnum.H19_VALV.name: {}}
+        self.valves_status = {TDValvesEnum.H1_VALV.name: {},
+                              TDValvesEnum.H19_VALV.name: {}}
 
     @publish(["td_valves_timestamp","valves_status"])
     def _handler_valves_sync(self, message: dict, timestamp=0.0) -> None:
@@ -94,11 +94,11 @@
             message['message'][self.START_POS_VALVES_NEXT_POS:self.END_POS_VALVES_NEXT_POS]))[0]
 
         # To make sure values of the enums are not out of range
-        if ValvesEnum.has_value(vlv_id) and ValvesPositions.has_value(pos_id) and ValvesStates.has_value(pos_id):
-            vlv_name = ValvesEnum(vlv_id).name
+        if TDValvesEnum.has_value(vlv_id) and TDValvesPositions.has_value(pos_id) and TDValvesStates.has_value(pos_id):
+            vlv_name = TDValvesEnum(vlv_id).name
             # Update the valves dictionary
-            self.valves_status[vlv_name] = {'Valve': vlv_name, 'PosID': ValvesPositions(pos_id).name, 'PosCnt': pos_cnt,
-                                            'Cmd': next_pos, 'State': ValvesStates(state_id).name}
+            self.valves_status[vlv_name] = {'Valve': vlv_name, 'PosID': TDValvesPositions(pos_id).name, 'PosCnt': pos_cnt,
+                                            'Cmd': next_pos, 'State': TDValvesStates(state_id).name}
         self.td_valves_timestamp = timestamp
 
     def cmd_valves_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
@@ -139,8 +139,8 @@
         """
         Constructs and sends the TD valves set position for a valve
 
-        @param valve: integer - Valve number. Defined in ValvesEnum class
-        @param position: integer - Position number: Defined in ValvesPositions class
+        @param valve: integer - Valve number. Defined in TDValvesEnum class
+        @param position: integer - Position number: Defined in TDValvesPositions class
         @returns 1 if successful, zero otherwise
         """
 
@@ -166,7 +166,7 @@
         """
         Constructs and sends the TD valves home command
 
-        @param valve: integer - Valve number. Defined in ValvesEnum class
+        @param valve: integer - Valve number. Defined in TDValvesEnum 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
@@ -193,7 +193,7 @@
         """
         Constructs and sends the TD valves set position for a valve
 
-        @@param valve: integer - Valve number. Defined in ValvesEnum class
+        @@param valve: integer - Valve number. Defined in TDValvesEnum class
         @param position_count: integer value
         @param reset: integer - 1 to reset a previous override, 0 to override
         @returns 1 if successful, zero otherwise
@@ -212,7 +212,7 @@
         # If there is content...
         if received_message is not None:
 
-            self.logger.debug("Setting {} position to {} ".format(str(ValvesEnum(valve).name), position_count))
+            self.logger.debug("Setting {} position to {} ".format(str(TDValvesEnum(valve).name), position_count))
 
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
@@ -224,7 +224,7 @@
         """
         Constructs and sends the TD valves set position for a valve
 
-        @@param valve: integer - Valve number. Defined in ValvesEnum class
+        @@param valve: integer - Valve number. Defined in TDValvesEnum class
         @param status: integer value
         @param reset: integer - 1 to reset a previous override, 0 to override
         @returns 1 if successful, zero otherwise
@@ -243,7 +243,7 @@
         # If there is content...
         if received_message is not None:
 
-            self.logger.debug("Setting {} status to {} ".format(str(ValvesEnum(valve).name), status))
+            self.logger.debug("Setting {} status to {} ".format(str(TDValvesEnum(valve).name), status))
 
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
@@ -256,7 +256,7 @@
         Constructs and sends a given valve to change position by a
         given number of encoder counts.
 
-        @@param valve: integer - Valve number. Defined in ValvesEnum class
+        @@param valve: integer - Valve number. Defined in TDValvesEnum class
         @param count: integer value
         @returns 1 if successful, zero otherwise
         """
@@ -273,7 +273,7 @@
         # If there is content...
         if received_message is not None:
 
-            self.logger.debug("Setting {} position by {} ".format(str(ValvesEnum(valve).name), counts))
+            self.logger.debug("Setting {} position by {} ".format(str(TDValvesEnum(valve).name), counts))
 
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]