Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -rc67b334aaf46d4b3568c93598df34ffcf14e4af4 -r7f15dd8f390b87b8b93d8118ee1ddb9fd49b0449
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision c67b334aaf46d4b3568c93598df34ffcf14e4af4)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 7f15dd8f390b87b8b93d8118ee1ddb9fd49b0449)
@@ -69,26 +69,31 @@
                 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
             },
             dd_enum_repository.DDConductivitySensorNames.D27_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
             },
             dd_enum_repository.DDConductivitySensorNames.D29_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
             },
             dd_enum_repository.DDConductivitySensorNames.D43_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
             },
             dd_enum_repository.DDConductivitySensorNames.D74_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
             },
         }
 
@@ -117,6 +122,11 @@
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,     DataTypes.F32))
 
         self.process_into_dict(dict_to_update = self.dd_conductivity,
                                decoder_list = sensor_list,
Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -rc67b334aaf46d4b3568c93598df34ffcf14e4af4 -r7f15dd8f390b87b8b93d8118ee1ddb9fd49b0449
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision c67b334aaf46d4b3568c93598df34ffcf14e4af4)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 7f15dd8f390b87b8b93d8118ee1ddb9fd49b0449)
@@ -63,11 +63,13 @@
                 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
             },
         }
 
@@ -91,20 +93,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,