Index: leahi_dialin/fp/modules/ro_pump.py =================================================================== diff -u -r3d9e3c5cc1bcd5ce23187a5a627e1ff4177f38d6 -r20c821bd230fc7689a0275a2918981669ff5cc19 --- leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 3d9e3c5cc1bcd5ce23187a5a627e1ff4177f38d6) +++ leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.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 +from leahi_dialin.common import fp_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 DenaliChannels @@ -45,6 +45,9 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_ro_pump_data, self._handler_pump_sync) + self.ro_pump_timestamp = 0.0 #: The timestamp of the last message + + # The RO Pump data in dictionary format self.ro_pump = { fp_enum_repository.FPROPumpNames.P12_PUMP.name: { fp_enum_repository.FPPumpAttributes.STATE.name: 0, @@ -59,9 +62,7 @@ } } - self.ro_pump_timestamp = 0.0 - @publish(["msg_id_fp_ro_pump_data", "ro_pump", "ro_pump_timestamp" ]) def _handler_pump_sync(self, message, timestamp=0.0): """