Index: leahi_dialin/dd/modules/heaters.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r38e8dd31728056dbb7f9304c98ab16d7147b75a2
--- leahi_dialin/dd/modules/heaters.py	(.../heaters.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/dd/modules/heaters.py	(.../heaters.py)	(revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2)
@@ -18,7 +18,7 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.dd_defs import DDHeatersNames, DDHeatersAttributesEnum
+from leahi_dialin.common.dd_defs import dd_enum_repository
 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.protocols.CAN import DenaliChannels
@@ -41,23 +41,23 @@
         self.logger = logger
 
         self.dd_heaters = {
-            DDHeatersNames.D5_HEAT.name: {
-                DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name: 0.0,
-                DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name: 0.0,
-                DDHeatersAttributesEnum.HEAT_STATE.name: 0,
-                DDHeatersAttributesEnum.DUTY_CYCLE_COUNT.name: 0.0,
-                DDHeatersAttributesEnum.PWM_PERIOD.name: 0.0,
-                DDHeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name: 0.0,
-                DDHeatersAttributesEnum.TARGET_TEMP_TD.name: 0.0
+            dd_enum_repository.DDHeaterNames.D5_HEAT.name: {
+                dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE.name: 0.0,
+                dd_enum_repository.DDHeaterAttributes.HEAT_TARGET_TEMP.name: 0.0,
+                dd_enum_repository.DDHeaterAttributes.HEAT_STATE.name: 0,
+                dd_enum_repository.DDHeaterAttributes.DUTY_CYCLE_COUNT.name: 0.0,
+                dd_enum_repository.DDHeaterAttributes.PWM_PERIOD.name: 0.0,
+                dd_enum_repository.DDHeaterAttributes.ADJUSTED_TARGET_TEMP.name: 0.0,
+                dd_enum_repository.DDHeaterAttributes.TARGET_TEMP_TD.name: 0.0
             },
-            DDHeatersNames.D45_HEAT.name: {
-                DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name: 0.0,
-                DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name: 0.0,
-                DDHeatersAttributesEnum.HEAT_STATE.name: 0,
-                DDHeatersAttributesEnum.DUTY_CYCLE_COUNT.name: None,          # D45 Heater doesn't use this attribute
-                DDHeatersAttributesEnum.PWM_PERIOD.name: None,                # D45 Heater doesn't use this attribute
-                DDHeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name: None,      # D45 Heater doesn't use this attribute
-                DDHeatersAttributesEnum.TARGET_TEMP_TD.name: None             # D45 Heater doesn't use this attribute
+            dd_enum_repository.DDHeaterNames.D45_HEAT.name: {
+                dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE.name: 0.0,
+                dd_enum_repository.DDHeaterAttributes.HEAT_TARGET_TEMP.name: 0.0,
+                dd_enum_repository.DDHeaterAttributes.HEAT_STATE.name: 0,
+                dd_enum_repository.DDHeaterAttributes.DUTY_CYCLE_COUNT.name: None,          # D45 Heater doesn't use this attribute
+                dd_enum_repository.DDHeaterAttributes.PWM_PERIOD.name: None,                # D45 Heater doesn't use this attribute
+                dd_enum_repository.DDHeaterAttributes.ADJUSTED_TARGET_TEMP.name: None,      # D45 Heater doesn't use this attribute
+                dd_enum_repository.DDHeaterAttributes.TARGET_TEMP_TD.name: None             # D45 Heater doesn't use this attribute
             }
         }
 
@@ -90,25 +90,25 @@
         @param message:  published DD heaters data message
         @returns none
         """
-        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name] = (
+        self.dd_heaters[dd_enum_repository.DDHeaterNames.D5_HEAT.name][dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0]
-        self.dd_heaters[DDHeatersNames.D45_HEAT.name][DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name] = (
+        self.dd_heaters[dd_enum_repository.DDHeaterNames.D45_HEAT.name][dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0]
-        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name] = (
+        self.dd_heaters[dd_enum_repository.DDHeaterNames.D5_HEAT.name][dd_enum_repository.DDHeaterAttributes.HEAT_TARGET_TEMP.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])))[0]
-        self.dd_heaters[DDHeatersNames.D45_HEAT.name][DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name] = (
+        self.dd_heaters[dd_enum_repository.DDHeaterNames.D45_HEAT.name][dd_enum_repository.DDHeaterAttributes.HEAT_TARGET_TEMP.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])))[0]
-        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.HEAT_STATE.name] = (
+        self.dd_heaters[dd_enum_repository.DDHeaterNames.D5_HEAT.name][dd_enum_repository.DDHeaterAttributes.HEAT_STATE.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0]
-        self.dd_heaters[DDHeatersNames.D45_HEAT.name][DDHeatersAttributesEnum.HEAT_STATE.name] = (
+        self.dd_heaters[dd_enum_repository.DDHeaterNames.D45_HEAT.name][dd_enum_repository.DDHeaterAttributes.HEAT_STATE.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0]
-        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.DUTY_CYCLE_COUNT.name] = (
+        self.dd_heaters[dd_enum_repository.DDHeaterNames.D5_HEAT.name][dd_enum_repository.DDHeaterAttributes.DUTY_CYCLE_COUNT.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0]
-        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.PWM_PERIOD.name] = (
+        self.dd_heaters[dd_enum_repository.DDHeaterNames.D5_HEAT.name][dd_enum_repository.DDHeaterAttributes.PWM_PERIOD.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])))[0]
-        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name] = (
+        self.dd_heaters[dd_enum_repository.DDHeaterNames.D5_HEAT.name][dd_enum_repository.DDHeaterAttributes.ADJUSTED_TARGET_TEMP.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])))[0]
-        self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.TARGET_TEMP_TD.name] = (
+        self.dd_heaters[dd_enum_repository.DDHeaterNames.D5_HEAT.name][dd_enum_repository.DDHeaterAttributes.TARGET_TEMP_TD.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])))[0]
 
         self.dbg1 = struct.unpack('f', bytearray(
@@ -169,7 +169,7 @@
         duty = float_to_bytearray(duty_cycle/100)
         payload = rst + duty + htr
 
-        heater_name = DDHeatersNames(heater).name.split('_')[0]
+        heater_name = dd_enum_repository.DDHeaterNames(heater).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -196,7 +196,7 @@
         tmp = float_to_bytearray(temperature)
         payload = htr + cmd + tmp
 
-        heater_name = DDHeatersNames(heater).name.split('_')[0]
+        heater_name = dd_enum_repository.DDHeaterNames(heater).name.split('_')[0]
         start_or_stop = 'Start' if command == 0 else 'Stop'
         return cmd_generic_override(
             payload = payload,
@@ -223,7 +223,7 @@
         rst = integer_to_bytearray(reset)
         payload = rst + tmp + htr
 
-        heater_name = DDHeatersNames(heater).name.split('_')[0]
+        heater_name = dd_enum_repository.DDHeaterNames(heater).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,
@@ -249,7 +249,7 @@
         rst = integer_to_bytearray(reset)
         payload = rst + prd + htr
 
-        heater_name = DDHeatersNames(heater).name.split('_')[0]
+        heater_name = dd_enum_repository.DDHeaterNames(heater).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,