Index: leahi_dialin/fp/modules/alarms.py
===================================================================
diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r38e8dd31728056dbb7f9304c98ab16d7147b75a2
--- leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93)
+++ leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2)
@@ -19,7 +19,7 @@
 
 from leahi_dialin.common.alarm_defs import AlarmList
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.fp_defs import FPEventDataType
+from leahi_dialin.common.fp_defs import fp_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 DenaliMessage, DenaliChannels
@@ -70,8 +70,8 @@
         self.alarm_data_type = dict()
 
         # Loop through the list of the event data type enum and update the dictionary
-        for data_type in FPEventDataType:
-            event_data_type = FPEventDataType(data_type).name
+        for data_type in fp_enum_repository.FPEventDataTypes:
+            event_data_type = fp_enum_repository.FPEventDataTypes(data_type).name
             struct_unpack_type = None
 
             # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is
@@ -101,13 +101,13 @@
 
         data_typ_1 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
         # Get the corresponding structure format
-        struct_data_type_1 = self.alarm_data_type[FPEventDataType(data_typ_1[0]).name]
+        struct_data_type_1 = self.alarm_data_type[fp_enum_repository.FPEventDataTypes(data_typ_1[0]).name]
         # Get the data value by unpacking the data type
         data_1 = struct.unpack(struct_data_type_1, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
 
         data_typ_2 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
         # Get the corresponding structure format
-        struct_data_type_2 = self.alarm_data_type[FPEventDataType(data_typ_2[0]).name]
+        struct_data_type_2 = self.alarm_data_type[fp_enum_repository.FPEventDataTypes(data_typ_2[0]).name]
         # Get the data value by unpacking the data type
         data_2 = struct.unpack(struct_data_type_2, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))