Index: leahi_dialin/td/modules/td_test_configs.py =================================================================== diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422 --- leahi_dialin/td/modules/td_test_configs.py (.../td_test_configs.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) +++ leahi_dialin/td/modules/td_test_configs.py (.../td_test_configs.py) (revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422) @@ -8,20 +8,24 @@ # @file td_test_configs.py # # @author (last) Zoltan Miskolci -# @date (last) 08-Jan-2026 +# @date (last) 05-May-2026 # @author (original) Jonny Paguio # @date (original) 20-Aug-2025 # ############################################################################ +# Module imports from logging import Logger +# Project imports from leahi_dialin.common.constants import NO_RESET -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.common.override_templates import cmd_generic_override from leahi_dialin.common.test_config_defs import TDTestConfigOptions -from leahi_dialin.protocols.CAN import DenaliChannels -from leahi_dialin.utils.base import AbstractSubSystem, publish +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels +from leahi_dialin.utils.abstract_classes import AbstractSubSystem +from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_integer @@ -30,20 +34,19 @@ TD Dialin API sub-class for setting and getting the test configurations. """ - def __init__(self, can_interface, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - @param can_interface: Denali CAN Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.td_to_dialin_ch_id - self.msg_id_td_send_test_config = MsgIds.MSG_ID_TD_SEND_TEST_CONFIGURATION.value - self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_send_test_config, - self._handler_td_test_config_sync) + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_dialin_ch_id, + message_id = MsgIds.MSG_ID_TD_SEND_TEST_CONFIGURATION.value, + function = self._handler_td_test_config_sync) self.td_test_configs_response_timestamp = 0.0 #: The timestamp of the latest message self.td_test_configs = dict() #: The Test Config data in dictionary format @@ -67,14 +70,14 @@ @param message: published TD test configurations message @return: None """ + print('test config response') payload = message['message'] index = MsgFieldPositions.START_POS_FIELD_1 for config in TDTestConfigOptions.__members__: if 'NUM_OF_TEST_CONFIGS' not in config: config_value, index = bytearray_to_integer(payload, index, False) self.td_test_configs[config] = config_value - self.td_test_configs_response_timestamp = timestamp @@ -95,7 +98,7 @@ response = cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_SET_TEST_CONFIGURATION, entity_name = f'TD {TDTestConfigOptions(config).name} Test Config', override_text = 'Active', @@ -118,7 +121,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_GET_TEST_CONFIGURATION, entity_name = f'Get TD Test Configuration Record', override_text = 'Active', @@ -137,7 +140,7 @@ response = cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_td_ch_id, + channel_id = CanChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_RESET_ALL_TEST_CONFIGURATIONS, entity_name = f'Reset all TD Test Configurations', override_text = 'Active',