Index: leahi_dialin/fp/modules/events.py
===================================================================
diff -u -r1f7b5ac840adf6740b023706fcb73691c33a9be7 -r7ec1428451adfb2aabf7a64794e818a9916250c7
--- leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 1f7b5ac840adf6740b023706fcb73691c33a9be7)
+++ leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 7ec1428451adfb2aabf7a64794e818a9916250c7)
@@ -14,17 +14,20 @@
 #
 ############################################################################
 
+# Module imports
 import struct
 from logging import Logger
 from datetime import datetime
-from time import time
+from typing import Tuple
 
+# Project imports
 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 MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels, CanMessenger
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 from leahi_dialin.utils.base import publish
+from leahi_dialin.utils.enums import DialinEnum
 
 
 class FPEvents(AbstractSubSystem):
@@ -67,6 +70,17 @@
                                     fp_enum_repository.FPOpModes.MODE_DEGP.name: fp_enum_repository.FPGenPermeateDefStates,
                                     fp_enum_repository.FPOpModes.MODE_NLEG.name: fp_enum_repository.FPNotLegalStates}
 
+        # Dictionary of the sub mode as key and the state states enum class as the valued
+        self._sub_mode_2_states = { fp_enum_repository.FPFaultStates.DD_FAULT_STATE_START.name: fp_enum_repository.FPFaultNVDataStates,
+                                    fp_enum_repository.FPPreGenPermeateStates.FP_PRE_GENP_INLET_PRES_CHECK.name: fp_enum_repository.FPInletPresCheckStates,
+                                    fp_enum_repository.FPPreGenPermeateStates.FP_PRE_GENP_FILTER_FLUSH.name: fp_enum_repository.FPFilterFlushStates,
+                                    fp_enum_repository.FPPreGenPermeateStates.FP_PRE_GENP_PERMEATE_FLUSH.name: fp_enum_repository.FPPermeateFlushStates,
+                                    fp_enum_repository.FPPreGenPermeateStates.FP_PRE_GENP_CONCENTRATE_FLUSH.name: fp_enum_repository.FPConcentrateFlushStates,
+                                    fp_enum_repository.FPPreGenPDefStates.FP_PRE_GENP_DEF_FLUSH.name: fp_enum_repository.FPDefFlushStates }
+
+        # Dictionary of the state as key and the sub state states enum class as the valued
+        self._state_2_sub_states = { }
+        
         # 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()
@@ -283,7 +297,8 @@
             event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2)
 
         elif event_enum is fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS:
-            event_tuple = (current_timestamp, op_mode, sub_mode, sub_state)
+            op_mode_enum, sub_mode_enum, state_enum, _ = self._operation_status_match(op_mode=op_mode, sub_mode=sub_mode, state=sub_state)
+            event_tuple = (current_timestamp, op_mode_enum, sub_mode_enum, state_enum)
 
         # Update event dictionary
         self._event_dictionary[event_enum.name].append(event_tuple)
@@ -306,3 +321,27 @@
         self.process_into_vars(decoder_list = msg_list,
                               message = message)
         self.event_op_mode_timestamp = timestamp
+
+
+    def _operation_status_match(self, op_mode: int, sub_mode: int=None, state:int=None, sub_state: int=None) -> Tuple[DialinEnum, DialinEnum, DialinEnum, DialinEnum]:
+        """
+        Convert operation status values to enums.
+
+        :param op_mode: (Integer) The operation mode value
+        :param sub_mode: (Integer) The operation sub mode value
+        :param state: (Integer) The operation state value
+        :param sub_state: (Integer) The operation sub state value
+        :return: Returns the DialinEnum for each provied mode/state
+        """
+        op_mode_enum = fp_enum_repository.TDOpModes(op_mode)
+        sub_mode_enum = None
+        state_enum = None
+        sub_state_enum = None
+        if sub_mode is not None:
+            sub_mode_enum = self._op_mode_2_sub_mode[op_mode_enum.name](sub_mode)
+        if state is not None:
+            state_enum = self._sub_mode_2_states[sub_mode_enum.name](state)
+        if sub_state is not None:
+            sub_state_enum = self._state_2_sub_states[state_enum.name](sub_state)
+
+        return op_mode_enum, sub_mode_enum, state_enum, sub_state_enum