Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r5e60e9aed5d499a0e3244efeb8361554749233b4 -rc67b334aaf46d4b3568c93598df34ffcf14e4af4
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 5e60e9aed5d499a0e3244efeb8361554749233b4)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision c67b334aaf46d4b3568c93598df34ffcf14e4af4)
@@ -52,10 +52,6 @@
                                                                        function = self._handler_conductivity_sensors_sync)
 
             self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
-                                                                       message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA.value,
-                                                                       function = self._handler_conductivity_resistance_sync)
-
-            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
                                                                        message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_RESPONSE.value,
                                                                        function = self._handler_conductivity_version_sync)
 
@@ -64,51 +60,38 @@
                                                                        function = self._handler_conductivity_cal_sync)
 
         self.dd_conductivity_timestamp = 0.0                    #: The timestamp of the last conductivity message
-        self.dd_conductivity_resistance_timestamp = 0.0         #: The timestamp of the last conductivity resistance message
         self.dd_conductivity_cal_timestamp = 0.0                #: The timestamp of the last calibration response message
         self.dd_conductivity_version_timestamp =  0.0           #: The timestamp of the last version response message
 
         #: The Conductivity Sensors data in dictionary format
         self.dd_conductivity = {
-            dd_enum_repository.DDConductivitySensorNames.D17_COND.name: 0.0,
-            dd_enum_repository.DDConductivitySensorNames.D27_COND.name: 0.0,
-            dd_enum_repository.DDConductivitySensorNames.D29_COND.name: 0.0,
-            dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0,
-            dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0
-        }
-
-        self.dd_conductivity_resistance = {
             dd_enum_repository.DDConductivitySensorNames.D17_COND.name: {
-                dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0,
+                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.DDConductivitySensorNames.D27_COND.name: {
-                dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0,
+                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.DDConductivitySensorNames.D29_COND.name: {
-                dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0,
+                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.DDConductivitySensorNames.D43_COND.name: {
-                dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0,
+                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.DDConductivitySensorNames.D74_COND.name: {
-                dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0,
+                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,
             },
-            fp_enum_repository.FPConductivitySensorNames.P9_COND.name: {
-                dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0,
-                dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0,
-            },
-            fp_enum_repository.FPConductivitySensorNames.P18_COND.name: {
-                dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name: 0.0,
-                dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name: 0.0,
-            },
         }
 
-
     @publish(["msg_id_dd_conductivity_data", "dd_conductivity", "dd_conductivity_timestamp"])
     def _handler_conductivity_sensors_sync(self, message, timestamp=0.0):
         """
@@ -119,46 +102,26 @@
         @return: None
         """
         sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, DataTypes.F32))
-
-        self.process_into_dict(dict_to_update = self.dd_conductivity,
-                               decoder_list = sensor_list,
-                               message = message)
-        self.dd_conductivity_timestamp = timestamp
-
-    @publish(["msg_id_dd_conductivity_resistance_data", "dd_conductivity_resistance", "dd_conductivity_resistance_timestamp"])
-    def _handler_conductivity_resistance_sync(self, message, timestamp=0.0):
-        """
-        Handles published DD conductivity sensor resistance data messages. DD Conductivity sensor resistance data are captured
-        for reference.
-
-        @param message:  published DD conductivity sensor resistance data message
-        @return: None
-        """
-        sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
         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((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))
 
-        self.process_into_dict(dict_to_update = self.dd_conductivity_resistance,
+        self.process_into_dict(dict_to_update = self.dd_conductivity,
                                decoder_list = sensor_list,
                                message = message)
-        self.dd_conductivity_resistance_timestamp = timestamp
+        self.dd_conductivity_timestamp = timestamp
 
     @publish(["msg_id_dd_conductivity_version_data", "dd_conductivity_resistance", "dd_conductivity_version_timestamp"])
     def _handler_conductivity_version_sync(self, message, timestamp=0.0):