Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -ra5a9e5e30f912846a05c8e9293277d3a5ed373bd -ra1e3b1689e58a648f0e0f9cfdd1136cbfcc745eb --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision a5a9e5e30f912846a05c8e9293277d3a5ed373bd) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision a1e3b1689e58a648f0e0f9cfdd1136cbfcc745eb) @@ -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.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.FPConductivitySensorNames.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.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.FPConductivitySensorNames.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,