Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r03cf6f1c459aed5f12550222c40c58fc41c51688 -r9c1ee405a484654486ee23393f0b8e6b33a17154
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 03cf6f1c459aed5f12550222c40c58fc41c51688)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 9c1ee405a484654486ee23393f0b8e6b33a17154)
@@ -17,10 +17,9 @@
 from enum import unique
 
 from .dd_defs import DDConductivitySensorNames, DDPressureSensorNames, DDValveNames, DDLevelSensorNames
-from ..utils.base import DialinEnum
+from ..utils.enums import DialinEnum
 
 
-
 # ================================================== Constants ==================================================
 BETA_IOFP_COND_SENSOR_OFFSET = DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value          # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Conductivity Sensors enum
 BETA_IOFP_PRES_SENSOR_OFFSET = DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value                  # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Pressure Sensors enum
@@ -319,7 +318,9 @@
     FP_EVENT_PRE_GEN_DEF_CHANGE     = 7                         # FP defeatured pre gen state change
     FP_EVENT_GENP_DEF_CHANGE        = 8                         # FP defeatured gen permeate state change
     FP_EVENT_FAULT_ALARM_TRIGGER    = 9                         # FP event for alarms that would trigger
-    NUM_OF_FP_EVENT_IDS             = 10                        # Number of FP events
+    FP_EVENT_P25_LEVL_CHANGE        = 10                        # FP floater level change event
+    FP_EVENT_OPERATION_STATUS       = 11                        # FP operation status event
+    NUM_OF_FP_EVENT_IDS             = 12                        # Number of FP events
 
 FPEventList._str_list = {
     # Official Name :               Accepted strings
@@ -333,31 +334,12 @@
     'FP_EVENT_PRE_GEN_DEF_CHANGE': ['defeatured pre-generate permeate change', 'def pre-genp change'],
     'FP_EVENT_GENP_DEF_CHANGE': ['defeatured generate permeate change', 'def genp change'],
     'FP_EVENT_FAULT_ALARM_TRIGGER': ['alarm', 'alarm trigger', 'fault alarm trigger'],
+    'FP_EVENT_OPERATION_STATUS': ['operation status', 'status', 'op status', 'operation status change', 'status change', 'op status change'],
     'NUM_OF_FP_EVENT_IDS': [],
 }
 
 
-@unique
-class FPEventDataTypes(DialinEnum):
-    EVENT_DATA_TYPE_NONE    = 0                                 # No Event Data Type
-    EVENT_DATA_TYPE_U32     = 1                                 # Unsigned 32bit Event Data Type
-    EVENT_DATA_TYPE_S32     = 2                                 # Signed 32bit Event Data Type
-    EVENT_DATA_TYPE_F32     = 3                                 # Float 32bit Event Data Type
-    EVENT_DATA_TYPE_BOOL    = 4                                 # Boolean Event Data Type
-    NUM_OF_EVENT_DATA_TYPES = 5                                 # Number of Event Data Types
 
-FPEventDataTypes._str_list = {
-    # Official Name :               Accepted strings
-    'EVENT_DATA_TYPE_NONE': ['none'],
-    'EVENT_DATA_TYPE_U32': ['u32'],
-    'EVENT_DATA_TYPE_S32': ['s32'],
-    'EVENT_DATA_TYPE_F32': ['f32'],
-    'EVENT_DATA_TYPE_BOOL': ['bool', 'boolean'],
-    'NUM_OF_EVENT_DATA_TYPES': [],
-}
-
-
-
 # ================================================== Enum Creators: Names ==================================================
 @unique
 class FPBoostPumpNames(DialinEnum):