Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -re1a3a4c8d35a8b07750c13799c2d2229e2914494 -r70ede35f42770305f04b251b3372ef42a9cecbf5
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision e1a3a4c8d35a8b07750c13799c2d2229e2914494)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 70ede35f42770305f04b251b3372ef42a9cecbf5)
@@ -8,23 +8,23 @@
 # @file    fp_defs.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      29-Jan-2026
+# @date    (last)      25-Feb-2026
 # @author  (original)  Peter Lucia
 # @date    (original)  22-Jun-2021
 #
 ############################################################################
 
 from enum import unique
 
-from .dd_defs import dd_enum_repository
+from .dd_defs import DDConductivitySensorNames, DDPressureSensorNames, DDValveNames
 from ..utils.base import DialinEnum
 
 
 
 # ================================================== Constants ==================================================
-BETA_IOFP_COND_SENSOR_OFFSET = dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value          # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Conductivity Sensors enum
-BETA_IOFP_PRES_SENSOR_OFFSET = dd_enum_repository.DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value                  # Offset to translate Dialin FPTemperaturesNames to DD firmware DD Pressure Sensors enum
-BETA_IOFP_VALVE_OFFSET = dd_enum_repository.DDValveNames.NUM_OF_DD_VALVES.value                                        # Offset to translate Dialin FPValveNames to DD firmware DD_Valves
+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
+BETA_IOFP_VALVE_OFFSET = DDValveNames.NUM_OF_DD_VALVES.value                                        # Offset to translate Dialin FPValveNames to DD firmware DD_Valves
 
 # ================================================== Enum Creators: Operations ==================================================
 @unique
@@ -498,39 +498,3 @@
     'VALVE_STATE_OPEN': ['open'],
     'NUM_OF_VALVE_STATES': [],
 }
-
-
-
-# ================================================== Creates a singleton ==================================================
-class FP_Defs():
-
-    FPOpModes = FPOpModes
-    FPFaultStates = FPFaultStates
-    FPServiceStates = FPServiceStates
-    FPPostStates = FPPostStates
-    FPStandbyStates = FPStandbyStates
-    FPPreGenPermeateStates = FPPreGenPermeateStates
-    FPPreGenPDefStates = FPPreGenPDefStates
-    FPGenPermeateStates = FPGenPermeateStates
-    FPGenPermeateDefStates = FPGenPermeateDefStates
-    FPNotLegalStates = FPNotLegalStates
-
-    FPEventList= FPEventList
-    FPEventDataTypes= FPEventDataTypes
-
-    FPBoostPumpNames = FPBoostPumpNames
-    FPConductivitySensorNames = FPConductivitySensorNames
-    FPRORejectionRatioNames = FPRORejectionRatioNames
-    FPFlowSensorNames = FPFlowSensorNames
-    FPFloaterLevelSensorNames = FPFloaterLevelSensorNames
-    FPPressureSensorNames = FPPressureSensorNames
-    FPROPumpNames = FPROPumpNames
-    FPTemperatureSensorNames = FPTemperatureSensorNames
-    FPValveNames = FPValveNames
-    FPAllPumpNames = FPAllPumpNames
-        
-    FPFloaterLevels = FPFloaterLevels
-    FPPumpAttributes = FPPumpAttributes
-    FPValveStates = FPValveStates
-
-fp_enum_repository = FP_Defs()