Index: leahi_dialin/dd/modules/heaters.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r20c821bd230fc7689a0275a2918981669ff5cc19 --- leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) @@ -18,7 +18,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 DenaliChannels @@ -40,6 +40,14 @@ self.can_interface = can_interface self.logger = logger + if self.can_interface is not None: + channel_id = DenaliChannels.dd_sync_broadcast_ch_id + self.msg_id_dd_heaters_data = MsgIds.MSG_ID_DD_HEATERS_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_heaters_data, self._handler_heaters_sync) + + self.dd_heaters_timestamp = 0.0 #: The timestamp of the latest message + + #: The Heaters data in dictionary format self.dd_heaters = { dd_enum_repository.DDHeaterNames.D5_HEAT.name: { dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE.name: 0.0, @@ -61,7 +69,7 @@ } } - #Temp Heater Debugging published fields + # Temp Heater Debugging published fields self.dbg1 = 0.0 self.dbg2 = 0.0 self.dbg3 = 0.0 @@ -72,14 +80,7 @@ self.dbg8 = 0.0 self.dbg9 = 0.0 - self.dd_heaters_timestamp = 0.0 - - if self.can_interface is not None: - channel_id = DenaliChannels.dd_sync_broadcast_ch_id - self.msg_id_dd_heaters_data = MsgIds.MSG_ID_DD_HEATERS_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_heaters_data, self._handler_heaters_sync) - - + @publish(["msg_id_dd_heaters_data", "dd_heaters", "dbg1", "dbg2", "dbg3", "dbg4", "dbg5", "dbg6", "dbg7", "dbg8", "dbg9", "dd_heaters_timestamp"])