Index: leahi_dialin/dd/modules/dd_test_configs.py =================================================================== diff -u -r0bdafdb1821e164a8416ea4b47be946f13239b5a -r410054cfec7aee839266233249413b08b368fbd3 --- leahi_dialin/dd/modules/dd_test_configs.py (.../dd_test_configs.py) (revision 0bdafdb1821e164a8416ea4b47be946f13239b5a) +++ leahi_dialin/dd/modules/dd_test_configs.py (.../dd_test_configs.py) (revision 410054cfec7aee839266233249413b08b368fbd3) @@ -19,7 +19,7 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_override -from leahi_dialin.common.test_config_defs import DDTestConfigOptions +from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions from leahi_dialin.protocols.CAN import DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_integer @@ -59,7 +59,7 @@ @param config: (int) Test config to set @return: the status of a test config """ - return self.dd_test_configs[DDTestConfigOptions(config).name] + return self.dd_test_configs[DDFPTestConfigOptions(config).name] @publish(['msg_id_dd_send_test_config', 'dd_test_configs', 'dd_test_configs_response_timestamp']) @@ -74,7 +74,7 @@ payload = message['message'] index = MsgFieldPositions.START_POS_FIELD_1 - for config in DDTestConfigOptions.__members__: + for config in DDFPTestConfigOptions.__members__: if 'NUM_OF_TEST_CONFIGS' not in config: config_value, index = bytearray_to_integer(payload, index, False) self.dd_test_configs[config] = config_value @@ -101,7 +101,7 @@ reset = reset, channel_id = DenaliChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_SET_TEST_CONFIGURATION, - entity_name = f'DD {DDTestConfigOptions(config).name} Test Config', + entity_name = f'DD {DDFPTestConfigOptions(config).name} Test Config', override_text = 'Active', logger = self.logger, can_interface = self.can_interface) @@ -119,7 +119,6 @@ @return: 1 if successful, zero otherwise """ - return cmd_generic_override( payload = None, reset = NO_RESET, @@ -139,7 +138,6 @@ @return: 1 if successful, zero otherwise """ - response = cmd_generic_override( payload = None, reset = NO_RESET, @@ -149,7 +147,7 @@ override_text = 'Active', logger = self.logger, can_interface = self.can_interface) - + # Update the stored test configs from the FW self.cmd_request_test_config_status_from_fw() return response