Index: leahi_dialin/fp/modules/events.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422
--- leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/modules/events.py	(.../events.py)	(revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422)
@@ -8,7 +8,7 @@
 # @file    events.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      08-Jan-2026
+# @date    (last)      05-May-2026
 # @author  (original)  Dara Navaei
 # @date    (original)  12-Oct-2021
 #
@@ -19,10 +19,13 @@
 from datetime import datetime
 from time import time
 
-from leahi_dialin.common import fp_enum_repository
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.common import dd_enum_repository, fp_enum_repository
+from leahi_dialin.common.generic_defs import DataTypes
+from leahi_dialin.common.msg_defs import MsgFieldPositions
+from leahi_dialin.common.msg_ids import MsgIds
+from leahi_dialin.protocols.CAN import CanMessenger, CanChannels, CanMessenger
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 
 
 class FPEvents(AbstractSubSystem):
@@ -31,67 +34,47 @@
     """
     UNKNOWN_STATE = "UNKNOWN_PREVIOUS_STATE"
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
 
-        @param can_interface: Denali CAN Messenger object
+        @param can_interface: Can Messenger object
         """
         super().__init__()
-        self.can_interface = can_interface
+        self.can_interface: CanMessenger = can_interface
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.fp_sync_broadcast_ch_id
-            self.msg_id_fp_event = MsgIds.MSG_ID_FP_EVENT.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_event, self._handler_events_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_FP_EVENT.value,
+                                                                       function = self._handler_events_sync)
 
-            channel_id = DenaliChannels.fp_sync_broadcast_ch_id
-            self.msg_id_fp_op_mode_data = MsgIds.MSG_ID_FP_OP_MODE_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_op_mode_data,
-                                                                       self._handler_fp_op_mode_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_FP_OP_MODE_DATA.value,
+                                                                       function = self._handler_fp_op_mode_sync)
 
-        self.fp_events_timestamp = 0.0                          #: The timestamp of the last Event message
-        self.fp_event_op_mode = 0                               #: The new Operation Mode value
-        self.fp_event_sub_mode = 0                              #: The new Operation Sub-Mode value
-        self.fp_event_op_mode_timestamp = 0.0                   #: The timestamp of the last Operation Mode change message
+        self.events_timestamp = 0.0                             #: The timestamp of the last Event message
+        self.op_mode = 0                                        #: The new Operation Mode value
+        self.sub_mode = 0                                       #: The new Operation Sub-Mode value
+        self.event_op_mode_timestamp = 0.0                      #: The timestamp of the last Operation Mode change message
 
         # Dictionary of the mode as key and the sub mode states enum class as the value
-        self._fp_op_mode_2_sub_mode = {fp_enum_repository.FPOpModes.MODE_FAUL.name: fp_enum_repository.FPFaultStates,
-                                       fp_enum_repository.FPOpModes.MODE_SERV.name: fp_enum_repository.FPServiceStates,
-                                       fp_enum_repository.FPOpModes.MODE_INIT.name: fp_enum_repository.FPPostStates,
-                                       fp_enum_repository.FPOpModes.MODE_STAN.name: fp_enum_repository.FPStandbyStates,
-                                       fp_enum_repository.FPOpModes.MODE_PRE_GENP.name: fp_enum_repository.FPPreGenPermeateStates,
-                                       fp_enum_repository.FPOpModes.MODE_GENP.name: fp_enum_repository.FPGenPermeateStates,
-                                       fp_enum_repository.FPOpModes.MODE_DPGP.name: fp_enum_repository.FPPreGenPDefStates,
-                                       fp_enum_repository.FPOpModes.MODE_DEGP.name: fp_enum_repository.FPGenPermeateDefStates,
-                                       fp_enum_repository.FPOpModes.MODE_NLEG.name: fp_enum_repository.FPNotLegalStates}
+        self._op_mode_2_sub_mode = {fp_enum_repository.FPOpModes.MODE_FAUL.name: fp_enum_repository.FPFaultStates,
+                                    fp_enum_repository.FPOpModes.MODE_SERV.name: fp_enum_repository.FPServiceStates,
+                                    fp_enum_repository.FPOpModes.MODE_INIT.name: fp_enum_repository.FPPostStates,
+                                    fp_enum_repository.FPOpModes.MODE_STAN.name: fp_enum_repository.FPStandbyStates,
+                                    fp_enum_repository.FPOpModes.MODE_PRE_GENP.name: fp_enum_repository.FPPreGenPermeateStates,
+                                    fp_enum_repository.FPOpModes.MODE_GENP.name: fp_enum_repository.FPGenPermeateStates,
+                                    fp_enum_repository.FPOpModes.MODE_DPGP.name: fp_enum_repository.FPPreGenPDefStates,
+                                    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._event_dictionary = dict()
         for event in fp_enum_repository.FPEventList:
-            self._fp_event_dictionary[fp_enum_repository.FPEventList(event).name] = []
+            self._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.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
-            # 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
@@ -101,14 +84,14 @@
 
         @returns the requested FP event number
         """
-        list_length = len(self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name])
+        list_length = len(self._event_dictionary[fp_enum_repository.FPEventList(event_id).name])
 
         if list_length == 0:
             event = []
         elif event_number > list_length:
-            event = self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name][list_length - 1]
+            event = self._event_dictionary[fp_enum_repository.FPEventList(event_id).name][list_length - 1]
         else:
-            event = self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name][list_length - event_number - 1]
+            event = self._event_dictionary[fp_enum_repository.FPEventList(event_id).name][list_length - event_number - 1]
 
         return event
 
@@ -119,8 +102,8 @@
 
         @returns none
         """
-        for key in self._fp_event_dictionary:
-            self._fp_event_dictionary[key].clear()
+        for key in self._event_dictionary:
+            self._event_dictionary[key].clear()
 
 
     def get_fp_events(self, event_id, number_of_events=1):
@@ -135,23 +118,23 @@
         list_of_events = []
 
         # If there are not enough event lists send all the events that are available
-        if len(self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name]) <= number_of_events:
-            list_of_events = self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name]
+        if len(self._event_dictionary[fp_enum_repository.FPEventList(event_id).name]) <= number_of_events:
+            list_of_events = self._event_dictionary[fp_enum_repository.FPEventList(event_id).name]
         else:
             # Get the all the events
-            complete_list = self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name]
+            complete_list = self._event_dictionary[fp_enum_repository.FPEventList(event_id).name]
             # Since the last <number_of_message> are located at the end of the list, iterate backwards for the defined
             # event messages
             for i in range(len(complete_list) - 1, len(complete_list) - number_of_events - 1, -1):
                 list_of_events.append(complete_list[i])
 
         if number_of_events == 0:
-            list_of_events = self._fp_event_dictionary[fp_enum_repository.FPEventList(event_id).name]
+            list_of_events = self._event_dictionary[fp_enum_repository.FPEventList(event_id).name]
 
         return list_of_events
 
 
-    @publish(["msg_id_fp_event", "fp_events_timestamp", '_fp_event_dictionary'])
+    @publish(["msg_id_fp_event", "events_timestamp", '_event_dictionary'])
     def _handler_events_sync(self, message, timestamp=0.0):
         """
         Handles published events message
@@ -164,134 +147,151 @@
         op_mode = 0
         sub_mode = 0
         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
+        compensated_event_id = event_id - dd_enum_repository.DDEventList.NUM_OF_DD_EVENT_IDS.value
+        event_enum = fp_enum_repository.FPEventList(compensated_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(
+        if event_enum is fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS:
+            # 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.FPEventDataTypes(event_data_type_1).name]
-            op_mode = struct.unpack('<B', bytearray(
+            # For debug reasons get the full second byte
+            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]
+            # 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.FPEventDataTypes(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.FPEventDataTypes(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.FPEventDataTypes(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:
-            # 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
-            # It is a list of tuples that each tuple is (timestamp, event type, prev op mode, current op mode)
-            if op_list_len != 0:
-                last_op_tuple = self._fp_event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name][op_list_len - 1]
+        elif event_enum is fp_enum_repository.FPEventList.FP_EVENT_SUB_MODE_CHANGE:
+            # Get the Op Mode Change messages
+            op_modes_list = self._event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name]
+            
+            # If there are Op mode change messages, use it to determine the operation mode for the current submode change
+            # Index description:
+            # 0: Timestamp
+            # 1: Name
+            # 2: Previous Op / Sub Mode
+            # 3: Current Op / Sub Mode
+            if len(op_modes_list) != 0:
+                # Get the Sub Mode Change messages
+                sub_mode_list = self._event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_SUB_MODE_CHANGE.name]
+                last_op_mode_message = op_modes_list[-1]
 
-            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'),
-                                 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
-            # i.e. (timestamp, event type, prev, current)
-            current_op_mode = last_op_tuple[len(last_op_tuple) - 1]
-            current_op_mode_timestamp = datetime.strptime(last_op_tuple[0], '%Y-%m-%d %H:%M:%S.%f')
+                # Check if this is not the very first Sub Mode Change message
+                if len(sub_mode_list != 0):
+                    # Get the timestamps of the last messages of both list for comparison
+                    prev_op_mode_timestamp = datetime.strptime(last_op_mode_message[0], '%Y-%m-%d %H:%M:%S.%f')
+                    prev_sub_mode_timestamp = datetime.strptime(sub_mode_list[-1][0], '%Y-%m-%d %H:%M:%S.%f')
 
-            sub_mode_list_len = len(self._fp_event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_SUB_MODE_CHANGE.name])
+                    # In case the Op Mode Change is older then the previous Sub Mode Change,
+                    # use the current Op Mode from the previous Op Mode Change message for both data
+                    if prev_op_mode_timestamp <= prev_sub_mode_timestamp:
+                        event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[3]](event_data_1).name
+                        event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]](event_data_2).name
+                    
+                    # In case the Op Mode Change is newer then the previous Sub Mode Change,
+                    # use the operation mode informations from the last Op Mode Change message
+                    else:
+                        event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[2]](event_data_1).name
+                        event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]](event_data_2).name
+                
+                # In case this is the very first Sub Mode Change message,
+                # use the operation mode informations from the last Op Mode Change message
+                else:
+                    event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[2]](event_data_1).name
+                    event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]](event_data_2).name
 
-            if sub_mode_list_len != 0:
-                # Get the tuple prior to the last tuple and get its previous and current operation modes
-                current_sub_tuple = self._fp_event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_SUB_MODE_CHANGE.name][
-                    sub_mode_list_len - 1]
-
-                current_sub_mode_timestamp = datetime.strptime(current_sub_tuple[0], '%Y-%m-%d %H:%M:%S.%f')
+            # In case there are no Op Mode Change messages, use the Operations States messages
+            # to identify the Op Modes for the Sub Modes
             else:
-                current_sub_mode_timestamp = 0
+                # Get the Operation Status Change messages
+                op_status_list = self._event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS.name]
+                
+                data_2_found = False
+                event_1_op_mode = self.UNKNOWN_STATE
+                event_2_op_mode = self.UNKNOWN_STATE
 
-            # Get the class of the states enums of the current operation mode that is running
-            current_sub_mode_enum_class = self._fp_op_mode_2_sub_mode[current_op_mode]
-
-            # Check if the operation modes of the two tuples match
-            # i.e. last = (timestamp, event type, prev, current) and one before = (timestamp, event type, prev, current)
-            # If the prev and current match respectively, it means the current operation mode has not changed so the
-            # operation mode states can be converted from the current sub mode enum class
-            if current_sub_mode_timestamp != 0:
-                if current_op_mode_timestamp <= current_sub_mode_timestamp:
-                    event_data_1 = current_sub_mode_enum_class(event_data_1).name
-                    event_data_2 = current_sub_mode_enum_class(event_data_2).name
-
-                elif current_op_mode_timestamp > current_sub_mode_timestamp:
-                    # If the previous and current of the last two tuples do not match, then an operation mode transition
-                    # has occurred and the previous state is converted from the previous class and the current op mode
-                    # is converted from current operation states enum class.
-                    # i.e last = (timestamp, event type, 3, 8) and one before = (timestamp, event type, 8, 3)
-                    # previous and current do not match so in the last type (timestamp, event type, 8, 3) the prev state
-                    # should be from op mode 8 and the current state should be from op mode 3
-                    previous_op_mode = last_op_tuple[len(last_op_tuple) - 2]
-                    if previous_op_mode != FPEvents.UNKNOWN_STATE:
-                        previous_sub_mode_enum_class = self._fp_op_mode_2_sub_mode[previous_op_mode]
-                        event_data_1 = previous_sub_mode_enum_class(event_data_1).name
-                    # Unknown previous state. Display value instead of name.
+                # Go through the Operation Status Change message list starting from the back
+                # Index description:
+                # 0: Timestamp
+                # 1: Op Mode
+                # 2: Sub Mode
+                # 3: State
+                for i in range(len(op_status_list) - 1, -1, -1):
+                    op_status_msg = op_status_list[i]
+                    
+                    # Look for a match for event_data_2
+                    if not data_2_found:
+                        if op_status_msg[2] == event_data_2:
+                            event_2_op_mode = fp_enum_repository.FPOpModes(op_status_msg[1]).name
+                            data_2_found = True
+                    
+                    # Look for a match for event_data_1 after event_data_2 is found
+                    # Criteria is that the opmode, submode pair can't be the same as the one found for event_data_2
                     else:
-                        event_data_1 = str(event_data_1)
-                    event_data_2 = current_sub_mode_enum_class(event_data_2).name
-            else:
+                        if op_status_msg[2] == event_data_1 and \
+                            (op_status_msg[2] != event_data_2 or fp_enum_repository.FPOpModes(op_status_msg[1]).name != event_2_op_mode):
+                            event_1_op_mode = fp_enum_repository.FPOpModes(op_status_msg[1]).name
+                
+                # If op mode for event_data_2 found but not found for event_data_1 and run out of operation states
+                # assume it's the start of the unit start up and the going to standby is not logged yet
+                if event_2_op_mode != self.UNKNOWN_STATE and event_1_op_mode == self.UNKNOWN_STATE:
+                    event_1_op_mode = fp_enum_repository.FPOpModes.MODE_STAN.name
 
-                if event_data_2 != 0:
-                    event_data_1 = current_sub_mode_enum_class(event_data_1).name
-                    event_data_2 = current_sub_mode_enum_class(event_data_2).name
-                else:
-                    previous_sub_mode = current_sub_tuple[len(current_sub_tuple) - 2]
-                    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)
+                # Update the event_data values
+                event_data_1 = self._op_mode_2_sub_mode[event_1_op_mode](event_data_1).name
+                event_data_2 = self._op_mode_2_sub_mode[event_2_op_mode](event_data_2).name
+            
+            # Update the tuple
+            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_events_timestamp = timestamp
+        self._event_dictionary[event_enum.name].append(event_tuple)
+        self.events_timestamp = timestamp
 
 
-    @publish(["msg_id_fp_op_mode_data", "fp_event_op_mode_timestamp", "fp_event_op_mode", "fp_event_sub_mode"])
+    @publish(["msg_id_fp_op_mode_data", "event_op_mode_timestamp", "op_mode", "sub_mode"])
     def _handler_fp_op_mode_sync(self, message, timestamp=0.0):
         """
         Handles published FP operation mode messages.  Current FP operation mode
@@ -300,11 +300,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.op_mode',   DataTypes.U32))
+        msg_list.append(('self.sub_mode',  DataTypes.U32))
 
-        self.fp_event_op_mode = mode[0]
-        self.fp_event_sub_mode = smode[0]
-        self.fp_event_op_mode_timestamp = timestamp
+        self.process_into_vars(decoder_list = msg_list,
+                              message = message)
+        self.event_op_mode_timestamp = timestamp