Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -r6ce1aaaa1c5ce4ef44d51d7c805c81e34cdb2499 -r3f4937e339925dde0b95f08e49969f8983c5cba4 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 6ce1aaaa1c5ce4ef44d51d7c805c81e34cdb2499) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 3f4937e339925dde0b95f08e49969f8983c5cba4) @@ -22,7 +22,7 @@ from leahi_dialin.common import fp_enum_repository, dd_enum_repository from leahi_dialin.common.fp_defs import BETA_IOFP_COND_SENSOR_OFFSET from leahi_dialin.common.generic_defs import DataTypes -from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.common.msg_ids import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem @@ -102,7 +102,7 @@ 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, + self.process_into_vars(dict_to_update = self.fp_conductivity, decoder_list = sensor_list, message = message) self.fp_conductivity_timestamp = timestamp @@ -124,7 +124,7 @@ sensor_list.append((fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO_TANK_FILL.name, DataTypes.F32)) sensor_list.append((fp_enum_repository.FPRORejectionRatioNames.GEN_PERMEATE_STATE.name, DataTypes.U32)) - self.process_into_dict(dict_to_update = self.ro_rejection_ratio, + self.process_into_vars(dict_to_update = self.ro_rejection_ratio, decoder_list = sensor_list, message = message) self.ro_rejection_ratio_timestamp = timestamp