Index: dialin/hd/alarms.py
===================================================================
diff -u -r32001abdfb62770761771b563eb6ff517152fc76 -ra91ed2564416e9d1e96522fb3a9d26abe60139d5
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 32001abdfb62770761771b563eb6ff517152fc76)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision a91ed2564416e9d1e96522fb3a9d26abe60139d5)
@@ -20,6 +20,7 @@
 
 from .constants import RESET, NO_RESET
 from ..common.msg_defs import MsgIds, MsgFieldPositions
+from ..common.hd_defs import HDEventDataType
 from ..protocols.CAN import DenaliMessage, DenaliChannels
 from ..utils.base import AbstractSubSystem, publish
 from ..utils.checks import check_broadcast_interval_override_ms
@@ -114,6 +115,7 @@
         self.alarm_clear_top_only_flags = [False] * 500
 
         # alarm information
+        self.alarm_data_type = dict()
         self.alarm_volume = 0
         self.alarm_audio_curr_hg = 0.0
         self.alarm_audio_curr_lg = 0.0
@@ -122,7 +124,23 @@
         self.alarm_table_button_blockers = [False] * self.AlarmResponseButtons.NUM_OF_HD_ALARM_RESPONSE_BUTTONS.value
         self.alarm_state_button_blockers = [False] * self.AlarmResponseButtons.NUM_OF_HD_ALARM_RESPONSE_BUTTONS.value
 
-    def get_current_alarm_priority(self):
+        # Loop through the list of the event data type enum and update the dictionary
+        for data_type in HDEventDataType:
+            event_data_type = HDEventDataType(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
+            # the corresponding format in the python struct
+            if 'U32' in event_data_type or 'BOOL' in event_data_type:
+                struct_unpack_type = 'I'
+            elif 'S32' in event_data_type:
+                struct_unpack_type = 'i'
+            elif 'F32' in event_data_type:
+                struct_unpack_type = 'f'
+
+            self.alarm_data_type[event_data_type] = struct_unpack_type
+
+    def get_current_alarms_state(self):
         """
         Gets the current alarms state.
 
@@ -453,23 +471,24 @@
         @return: none
         """
         self.logger.debug("Alarm activated!")
-        alarm_id = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
-        data_typ_1 = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
-        data_1 = struct.unpack('i', 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]))
-        data_2 = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
-        priority = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
-        rank = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
-        clr_top_only = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
+        alarm_id = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
 
+        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 = self.alarm_data_type[HDEventDataType(data_typ_1).name]
+        # Get the data value by unpacking the data type
+        data_1 = struct.unpack(struct_data_type, 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 = self.alarm_data_type[HDEventDataType(data_typ_2).name]
+        # Get the data value by unpacking the data type
+        data_2 = struct.unpack(struct_data_type, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
+
+        priority = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
+        rank = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
+        clr_top_only = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
+
         self.logger.debug("Alarm ID: %d %d %d" % (alarm_id[0], data_1[0], data_2[0]))
         self.alarm_states[alarm_id[0]] = True
         self.alarm_conditions[alarm_id[0]] = True