Index: leahi_dialin/fp/modules/events.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r75c97894e28b7cc684fcaf8f7ffba3f8c1bb61d8
--- leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 75c97894e28b7cc684fcaf8f7ffba3f8c1bb61d8)
@@ -67,32 +67,13 @@
                                        fp_enum_repository.FPOpModes.MODE_DEGP.name: fp_enum_repository.FPGenPermeateDefStates,
                                        fp_enum_repository.FPOpModes.MODE_NLEG.name: fp_enum_repository.FPNotLegalStates}
 
-        # Define the dictionaries
-        self._fp_event_dictionary = dict()
-        self._fp_event_data_type = dict()
-
         # Loop through the list of the FP events enums and initial the event dictionary. Each event is a key in the
         # dictionary and the value is a list.
+        self._fp_event_dictionary = dict()
         for event in fp_enum_repository.FPEventList:
             self._fp_event_dictionary[fp_enum_repository.FPEventList(event).name] = []
 
-        # Loop through the list of the event data type enum and update the dictionary
-        for data_type in fp_enum_repository.DataTypes:
-            event_data_type = fp_enum_repository.DataTypes(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._fp_event_data_type[event_data_type] = struct_unpack_type
-
-
     def get_fp_nth_event(self, event_id, event_number=0):
         """
         Returns the nth requested FP event
@@ -167,55 +148,54 @@
         sub_state = 0
         current_sub_tuple = []
 
-        event_id = struct.unpack('i', bytearray(
+        event_id = struct.unpack(DataTypes.U32.unpack_attrib(), bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        # Convert the event ID to enum
+        event_enum = fp_enum_repository.FPEventList(event_id)
+        current_timestamp = datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f')
 
         if event_id == fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS.value:
-            # Get the data type
-            event_data_type_1 = struct.unpack('i', bytearray(
+            # Get the data type - irrelevant
+            event_data_type_1 = struct.unpack(DataTypes.U32.unpack_attrib(), bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-            struct_data_type = self._fp_event_data_type[fp_enum_repository.DataTypes(event_data_type_1).name]
-            op_mode = struct.unpack('<B', bytearray(
+            # Opmode data is compressed into the 4 byte
+            op_mode = struct.unpack(DataTypes.U08.unpack_attrib(), bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.START_POS_FIELD_3+1]))[0]
-            sub_mode = struct.unpack('<B', bytearray(
+            sub_mode = struct.unpack(DataTypes.U08.unpack_attrib(), bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_3+1:MsgFieldPositions.START_POS_FIELD_3+2]))[0]
-            sub_state = struct.unpack('<B', bytearray(
+            sub_state = struct.unpack(DataTypes.U08.unpack_attrib(), bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_3+2:MsgFieldPositions.START_POS_FIELD_3+3]))[0]
-            event_data_type_2 = struct.unpack('i', bytearray(
+            _ = struct.unpack(DataTypes.U08.unpack_attrib(), bytearray(
+                message['message'][MsgFieldPositions.START_POS_FIELD_4+3:MsgFieldPositions.END_POS_FIELD_4]))[0]
+            
+            event_data_type_2 = struct.unpack(DataTypes.U32.unpack_attrib(), bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-            struct_data_type = self._fp_event_data_type[fp_enum_repository.DataTypes(event_data_type_2).name]
-            event_data_2 = struct.unpack(struct_data_type, bytearray(
+            event_data_2 = struct.unpack(DataTypes(event_data_type_2).unpack_attrib(), bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-
         else:
             # Get the data type
-            event_data_type_1 = struct.unpack('i', bytearray(
+            event_data_type_1 = struct.unpack(DataTypes.U32.unpack_attrib(), bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-            # Get the corresponding structure format
-            struct_data_type = self._fp_event_data_type[fp_enum_repository.DataTypes(event_data_type_1).name]
             # Get the data value by unpacking the data type
-            event_data_1 = struct.unpack(struct_data_type, bytearray(
+            event_data_1 = struct.unpack(DataTypes(event_data_type_1).unpack_attrib(), bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
 
-            event_data_type_2 = struct.unpack('i', bytearray(
+            event_data_type_2 = struct.unpack(DataTypes.U32.unpack_attrib(), bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-
-            struct_data_type = self._fp_event_data_type[fp_enum_repository.DataTypes(event_data_type_2).name]
-            event_data_2 = struct.unpack(struct_data_type, bytearray(
+            event_data_2 = struct.unpack(DataTypes(event_data_type_2).unpack_attrib(), bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
-        # Convert the event ID to enum
-        event_state_name = fp_enum_repository.FPEventList(event_id).name
         # Get the current timestamp and create a tuple of the current events
-        event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2)
+        event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2)
         # Check if the event state name is operation mode change. If it is, get the name of the operation modes
         # from the op modes enum class
-        if event_state_name == fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name:
+        if event_enum is fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE:
             event_data_1 = fp_enum_repository.FPOpModes(event_data_1).name
             event_data_2 = fp_enum_repository.FPOpModes(event_data_2).name
-            event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2)
+            event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2)
+
         # Check if the event state name is sub mode change.
-        elif event_state_name == fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name:
+        elif event_enum is fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE:
             # Get the length of the list of the op mode list
             op_list_len = len(self._fp_event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name])
             # Get the last tuple of the op mode
@@ -226,7 +206,7 @@
             else:
                 # No op mode event has been received before the submode event was received. Use broadcast messages to
                 # determine current op mode. Previous mode can not be known
-                last_op_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'),
+                last_op_tuple = (current_timestamp,
                                  fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name, FPEvents.UNKNOWN_STATE,
                                  fp_enum_repository.FPOpModes(self.fp_event_op_mode).name)
             # Get the current and previous operation modes of the last tuple in the list of the sub modes
@@ -282,13 +262,13 @@
                     previous_sub_mode_enum_class = self._fp_op_mode_2_sub_mode[previous_sub_mode]
                     event_data_1 = previous_sub_mode_enum_class(event_data_1).name
                     event_data_2 = current_sub_mode_enum_class(event_data_2).name
-            event_tuple = (datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S.%f'), event_state_name, event_data_1, event_data_2)
+            event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2)
 
-        elif event_state_name == fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS.name:
-            event_tuple = (time(), op_mode, sub_mode, sub_state)
+        elif event_enum is fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS:
+            event_tuple = (current_timestamp, op_mode, sub_mode, sub_state)
 
         # Update event dictionary
-        self._fp_event_dictionary[event_state_name].append(event_tuple)
+        self._fp_event_dictionary[event_enum.name].append(event_tuple)
         self.fp_events_timestamp = timestamp
 
 
@@ -301,11 +281,10 @@
         @param message:  published FP operation mode broadcast message
         @return: None
         """
-        mode = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
-        smode = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
+        msg_list = []
+        msg_list.append(('self.fp_event_op_mode',   DataTypes.U32))
+        msg_list.append(('self.fp_event_sub_mode',  DataTypes.U32))
 
-        self.fp_event_op_mode = mode[0]
-        self.fp_event_sub_mode = smode[0]
+        self.process_into_vars(decoder_list = msg_list,
+                              message = message)
         self.fp_event_op_mode_timestamp = timestamp