Index: leahi_dialin/td/modules/events.py =================================================================== diff -u -rdd92f40a5a5b13449356328cf2526dd948c587ad -r3c2bc6419b5796c03a7e4943938055c4ac36c24b --- leahi_dialin/td/modules/events.py (.../events.py) (revision dd92f40a5a5b13449356328cf2526dd948c587ad) +++ leahi_dialin/td/modules/events.py (.../events.py) (revision 3c2bc6419b5796c03a7e4943938055c4ac36c24b) @@ -18,12 +18,15 @@ import struct from logging import Logger from datetime import datetime +import time from typing import Tuple + # Project imports from leahi_dialin.common import td_enum_repository from leahi_dialin.common.generic_defs import DataTypes -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_defs import MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds from leahi_dialin.protocols.CAN import CanMessenger, CanChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem from leahi_dialin.utils.base import publish @@ -45,11 +48,11 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, message_id = MsgIds.MSG_ID_TD_EVENT.value, function = self._handler_events_sync) - self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, message_id = MsgIds.MSG_ID_TD_OP_MODE_DATA.value, function = self._handler_td_op_mode_sync) @@ -97,6 +100,7 @@ self._event_dictionary = dict() for event in td_enum_repository.TDEventList: self._event_dictionary[td_enum_repository.TDEventList(event).name] = [] + self.handler_execution_times = [] def get_td_nth_event(self, event_id, event_number=0): @@ -166,6 +170,7 @@ @param message: published TD events data message @returns none """ + start = time.perf_counter() event_data_1 = 0 event_data_2 = 0 op_mode = 0 @@ -308,6 +313,7 @@ # Update event dictionary self._event_dictionary[event_enum.name].append(event_tuple) self.events_timestamp = timestamp + self.handler_execution_times.append((timestamp, message, time.perf_counter() - start)) @publish(["msg_id_td_op_mode_data", "event_op_mode_timestamp", "op_mode", "sub_mode"])