Index: leahi_dialin/td/modules/pressure_sensors.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d
--- leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d)
@@ -20,7 +20,8 @@
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.common.td_defs import TDPressureSensorNames, TDPressureSensorAttributes
+from leahi_dialin.common.td_defs import td_enum_repository
+
 from leahi_dialin.protocols.CAN import DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
@@ -46,20 +47,20 @@
                                                                        self._handler_pressure_sync)
         self.td_pressure_timestamp = 0.0
         self.td_pressure_sensors = {
-            TDPressureSensorNames.H2_PRES.name: {
-                TDPressureSensorAttributes.PRES.name: 0.0,
-                TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0,
-                TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0,
-                TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 0
+            td_enum_repository.TDPressureSensorNames.H2_PRES.name: {
+                td_enum_repository.TDPressureSensorAttributes.PRES.name: 0.0,
+                td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0,
+                td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0,
+                td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 0
             },
-            TDPressureSensorNames.H14_PRES.name: {
-                TDPressureSensorAttributes.PRES.name: 0.0,
-                TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0,
-                TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0,
-                TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 0
+            td_enum_repository.TDPressureSensorNames.H14_PRES.name: {
+                td_enum_repository.TDPressureSensorAttributes.PRES.name: 0.0,
+                td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0,
+                td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0,
+                td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 0
             },
-            TDPressureSensorNames.H23_PRES.name: {
-                TDPressureSensorAttributes.PRES.name : 0.0
+            td_enum_repository.TDPressureSensorNames.H23_PRES.name: {
+                td_enum_repository.TDPressureSensorAttributes.PRES.name : 0.0
             }
         }
         self.pressure_limits_state = 0
@@ -112,19 +113,19 @@
         baro = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))
 
-        self.td_pressure_sensors[TDPressureSensorNames.H2_PRES.name][TDPressureSensorAttributes.PRES.name] = art[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H14_PRES.name][TDPressureSensorAttributes.PRES.name] = ven[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name] = art[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name] = ven[0]
         self.pressure_limits_state = pls[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H2_PRES.name][TDPressureSensorAttributes.PRES_LIMIT_MIN.name] = apl[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H2_PRES.name][TDPressureSensorAttributes.PRES_LIMIT_MAX.name] = apu[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H14_PRES.name][TDPressureSensorAttributes.PRES_LIMIT_MIN.name] = vpl[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H14_PRES.name][TDPressureSensorAttributes.PRES_LIMIT_MAX.name] = vpu[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H2_PRES.name][TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name] = lfa[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H14_PRES.name][TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name] = lfv[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name] = apl[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name] = apu[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name] = vpl[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name] = vpu[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name] = lfa[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name] = lfv[0]
         self.tmp_pressure = tps[0]
         self.tmp_min_limit = tmin[0]
         self.tmp_max_limit = tmax[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H23_PRES.name][TDPressureSensorAttributes.PRES.name] = baro[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H23_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name] = baro[0]
         self.td_pressure_timestamp = timestamp
 
 
@@ -166,7 +167,7 @@
         prs = float_to_bytearray(pressure)
         payload = rst + prs + sen
 
-        sensor_name = TDPressureSensorNames(sensor).name.split('_')[0]
+        sensor_name = td_enum_repository.TDPressureSensorNames(sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,