Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -r38e8dd31728056dbb7f9304c98ab16d7147b75a2
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2)
@@ -18,7 +18,7 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.fp_defs import FPConductivitySensorNames, FPRORejectionRatioEnum
+from leahi_dialin.common.fp_defs import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import DenaliChannels
@@ -51,16 +51,16 @@
         self.ro_rejection_ratio_timestamp = 0.0
 
         self.fp_conductivity = {
-            FPConductivitySensorNames.P9_COND.name: 0.0,
-            FPConductivitySensorNames.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
         }
 
 
@@ -73,9 +73,9 @@
         @param message:  published conductivity sensor data message
         @return: None
         """
-        self.fp_conductivity[FPConductivitySensorNames.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[FPConductivitySensorNames.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
@@ -90,15 +90,15 @@
         @param message: Published RO Rejection Ratio data message
         @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
@@ -162,7 +162,7 @@
         sensor_byte_array = integer_to_bytearray(sensor)
         payload = reset_byte_array + cond_byte_array + sensor_byte_array
 
-        sensor_name = FPConductivitySensorNames(sensor).name.split('_')[0]
+        sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -188,7 +188,7 @@
         sensor_byte_array = integer_to_bytearray(sensor)
         payload = reset_byte_array + read_byte_array + sensor_byte_array
 
-        sensor_name = FPConductivitySensorNames(sensor).name.split('_')[0]
+        sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -214,7 +214,7 @@
         sensor_byte_array = integer_to_bytearray(sensor)
         payload = reset_byte_array + error_byte_array + sensor_byte_array
 
-        sensor_name = FPConductivitySensorNames(sensor).name.split('_')[0]
+        sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,