Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r8f6f5505aa923057e686bd3fbef4af8b518e349e -r20c821bd230fc7689a0275a2918981669ff5cc19 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 8f6f5505aa923057e686bd3fbef4af8b518e349e) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) @@ -19,7 +19,7 @@ from logging import Logger from leahi_dialin.common.constants import NO_RESET -from leahi_dialin.common.dd_defs import dd_enum_repository +from leahi_dialin.common import dd_enum_repository 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 DenaliMessage, DenaliChannels @@ -49,6 +49,9 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_conductivity_data, self._handler_conductivity_sensors_sync) + self.dd_conductivity_timestamp = 0.0 #: The timestamp of the last message + + #: The Conductivity Sensors data in dictionary format self.dd_conductivity = { dd_enum_repository.DDConductivitySensorNames.D17_COND.name: 0.0, dd_enum_repository.DDConductivitySensorNames.D27_COND.name: 0.0, @@ -57,9 +60,7 @@ dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0 } - self.dd_conductivity_timestamp = 0.0 - @publish(["msg_id_dd_conductivity_data", "dd_conductivity", "dd_conductivity_timestamp"]) def _handler_conductivity_sensors_sync(self, message, timestamp=0.0): """