Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -red3eb121e6f8b717386c77af4419df76f9fa2e19 -r15dc2a98494cf4b459c1fcaeb4a70be3e8a9484a
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision ed3eb121e6f8b717386c77af4419df76f9fa2e19)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 15dc2a98494cf4b459c1fcaeb4a70be3e8a9484a)
@@ -91,20 +91,14 @@
         @return: None
         """
         sensor_list =[]
-        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.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,