Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -red3eb121e6f8b717386c77af4419df76f9fa2e19 -r15dc2a98494cf4b459c1fcaeb4a70be3e8a9484a --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision ed3eb121e6f8b717386c77af4419df76f9fa2e19) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 15dc2a98494cf4b459c1fcaeb4a70be3e8a9484a) @@ -1032,12 +1032,14 @@ CONDUCTIVITY = 0 # Conductivity CONDUCTIVITY_RESISTANCE = 1 # raw conductivity resistance Attribute RTD_RESISTANCE = 2 # raw RTD resistance Attribute - NUM_OF_RESISTANCE_ATTRIBUTES = 3 # Number of conductivity sensor Attributes + UNCOMPENSATED_COND = 3 # Uncompensated Conductivity + NUM_OF_RESISTANCE_ATTRIBUTES = 4 # Number of conductivity sensor Attributes DDConductivityResistanceAttributes._str_list = { # Official Name : Accepted strings 'CONDUCTIVITY': ['conductivity,'], - 'RTD_RESISTANCE': ['conductivity resistance'], - 'UNCOMPENSATED_COND' : ['rtd resistance'], + 'CONDUCTIVITY_RESISTANCE': ['conductivity resistance'], + 'RTD_RESISTANCE' : ['rtd resistance'], + 'UNCOMPENSATED_COND' : ['uncompensated conductivity'], 'NUM_OF_RESISTANCE_ATTRIBUTES': [], } \ No newline at end of file Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -red3eb121e6f8b717386c77af4419df76f9fa2e19 -r15dc2a98494cf4b459c1fcaeb4a70be3e8a9484a --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ed3eb121e6f8b717386c77af4419df76f9fa2e19) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 15dc2a98494cf4b459c1fcaeb4a70be3e8a9484a) @@ -117,6 +117,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 -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,