Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -r89f5dc5bbbf4eb9018610467eb1a4da188368e7a -r20c821bd230fc7689a0275a2918981669ff5cc19 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 89f5dc5bbbf4eb9018610467eb1a4da188368e7a) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) @@ -18,7 +18,7 @@ from logging import Logger from leahi_dialin.common.constants import NO_RESET -from leahi_dialin.common.fp_defs import fp_enum_repository, BETA_IOFP_COND_SENSOR_OFFSET +from leahi_dialin.common import fp_enum_repository, BETA_IOFP_COND_SENSOR_OFFSET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import DenaliChannels @@ -47,14 +47,16 @@ self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_FP_RO_REJECTION_RATIO_DATA.value, self._handler_ro_rejection_ratio_sync) - self.fp_conductivity_timestamp = 0.0 - self.ro_rejection_ratio_timestamp = 0.0 + self.fp_conductivity_timestamp = 0.0 #: The timestamp of the last Conductivity data message + self.ro_rejection_ratio_timestamp = 0.0 #: The timestamp of the last RO Rejection Ratio data message + #: The Conductivity Sensors data in dictionary format self.fp_conductivity = { fp_enum_repository.FPConductivitySensorNames.P9_COND.name: 0.0, fp_enum_repository.FPConductivitySensorNames.P18_COND.name: 0.0 } + #: The RO Rejection Ratio data in dictionary format self.ro_rejection_ratio = { fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO.name: 0.0, fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO_TANK_FILL.name: 0.0,