Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r77740bc2ccace473a471515cadd4bc1353360cd6 -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 77740bc2ccace473a471515cadd4bc1353360cd6)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e)
@@ -19,6 +19,7 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.fp_defs import FPConductivitySensorsEnum
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -45,14 +46,14 @@
             msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_conductivity_sensors_sync)
-
-        self.p9_cond = 0.0
-        self.p18_cond = 0.0
-
         self.fp_conductivity_timestamp = 0.0
 
-    @publish(["fp_conductivity_timestamp",
-              "p9_cond", "p18_cond"])
+        self.fp_conductivity = {
+            FPConductivitySensorsEnum.P9_COND.name: 0.0,
+            FPConductivitySensorsEnum.P18_COND.name: 0.0
+        }
+
+    @publish(["fp_conductivity_timestamp", "fp_conductivity"])
     def _handler_conductivity_sensors_sync(self, message, timestamp=0.0):
         """
         Handles published FP conductivity sensor data messages.  Conductivity sensor data are captured
@@ -62,9 +63,9 @@
         @return: None
         """
 
-        self.p9_cond = struct.unpack('f', bytearray(
+        self.fp_conductivity[FPConductivitySensorsEnum.P9_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.p18_cond = struct.unpack('f', bytearray(
+        self.fp_conductivity[FPConductivitySensorsEnum.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