Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r7a7b289d28b91a8cf9ddbd6d5db542abaee9721f -r96c3a69c442803a410554ad38f52705b0fad2707
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 7a7b289d28b91a8cf9ddbd6d5db542abaee9721f)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 96c3a69c442803a410554ad38f52705b0fad2707)
@@ -201,6 +201,7 @@
     MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4
     MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5
     MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xB6
+
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
     MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000
Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r0c78a2810977c2b23f16acdbed57ea62a5820973 -r96c3a69c442803a410554ad38f52705b0fad2707
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 0c78a2810977c2b23f16acdbed57ea62a5820973)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 96c3a69c442803a410554ad38f52705b0fad2707)
@@ -135,15 +135,15 @@
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
         sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
 
         self.process_into_dict(dict_to_update = self.dd_conductivity_resistance,
                                decoder_list = sensor_list,