Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r6ce1aaaa1c5ce4ef44d51d7c805c81e34cdb2499
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 6ce1aaaa1c5ce4ef44d51d7c805c81e34cdb2499)
@@ -19,10 +19,10 @@
 
 # Project imports
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common import fp_enum_repository
+from leahi_dialin.common import fp_enum_repository, dd_enum_repository
 from leahi_dialin.common.fp_defs import BETA_IOFP_COND_SENSOR_OFFSET
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
@@ -58,8 +58,19 @@
 
         #: The Conductivity Sensors data in dictionary format
         self.fp_conductivity = {
-            fp_enum_repository.FPConductivitySensorNames.P9_COND.name: 0.0,
-            fp_enum_repository.FPConductivitySensorNames.P18_COND.name: 0.0
+
+            fp_enum_repository.FPConductivitySensorNames.P9_COND.name: {
+                dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0,
+                dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name: 0.0,
+                dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0,
+                dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name: 0.0
+            },
+            fp_enum_repository.FPConductivitySensorNames.P18_COND.name: {
+                dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0,
+                dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name: 0.0,
+                dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0,
+                dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name: 0.0
+            },
         }
 
         #: The RO Rejection Ratio data in dictionary format
@@ -82,8 +93,14 @@
         @return: None
         """
         sensor_list =[]
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name,  DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name, DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name, DataTypes.F32))
 
         self.process_into_dict(dict_to_update = self.fp_conductivity,
                                decoder_list = sensor_list,