Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r1f6d8db8a800b32a70eb1176fcbd5263550a7180 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 1f6d8db8a800b32a70eb1176fcbd5263550a7180)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -18,7 +18,7 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.fp_defs import FPConductivitySensorsEnum, FPRORejectionRatioEnum
+from leahi_dialin.common.fp_defs import fp_enum_repository
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
@@ -51,16 +51,16 @@
         self.ro_rejection_ratio_timestamp = 0.0
 
         self.fp_conductivity = {
-            FPConductivitySensorsEnum.P9_COND.name: 0.0,
-            FPConductivitySensorsEnum.P18_COND.name: 0.0
+            fp_enum_repository.FPConductivitySensorNames.P9_COND.name: 0.0,
+            fp_enum_repository.FPConductivitySensorNames.P18_COND.name: 0.0
         }
 
         self.ro_rejection_ratio = {
-            FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO.name: 0.0,
-            FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO_TANK_FILL.name: 0.0,
-            FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO.name: 0.0,
-            FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO_TANK_FILL.name: 0.0,
-            FPRORejectionRatioEnum.GEN_PERMEATE_STATE.name: 0
+            fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO.name: 0.0,
+            fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO_TANK_FILL.name: 0.0,
+            fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO.name: 0.0,
+            fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO_TANK_FILL.name: 0.0,
+            fp_enum_repository.FPRORejectionRatioNames.GEN_PERMEATE_STATE.name: 0
         }
 
 
@@ -74,9 +74,9 @@
         @return: None
         """
 
-        self.fp_conductivity[FPConductivitySensorsEnum.P9_COND.name] = struct.unpack('f', bytearray(
+        self.fp_conductivity[fp_enum_repository.FPConductivitySensorNames.P9_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.fp_conductivity[FPConductivitySensorsEnum.P18_COND.name] = struct.unpack('f', bytearray(
+        self.fp_conductivity[fp_enum_repository.FPConductivitySensorNames.P18_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
         self.fp_conductivity_timestamp = timestamp
@@ -92,15 +92,15 @@
         @return: None
         """
 
-        self.ro_rejection_ratio[FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO.name] = struct.unpack('f', bytearray(
+        self.ro_rejection_ratio[fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.ro_rejection_ratio[FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO_TANK_FILL.name] = struct.unpack('f', bytearray(
+        self.ro_rejection_ratio[fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO_TANK_FILL.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.ro_rejection_ratio[FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO.name] = struct.unpack('f', bytearray(
+        self.ro_rejection_ratio[fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.ro_rejection_ratio[FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO_TANK_FILL.name] = struct.unpack('f', bytearray(
+        self.ro_rejection_ratio[fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO_TANK_FILL.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.ro_rejection_ratio[FPRORejectionRatioEnum.GEN_PERMEATE_STATE.name] = struct.unpack('i', bytearray(
+        self.ro_rejection_ratio[fp_enum_repository.FPRORejectionRatioNames.GEN_PERMEATE_STATE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
         self.ro_rejection_ratio_timestamp = timestamp