Index: leahi_dialin/dd/modules/dd_test_configs.py =================================================================== diff -u -rdb4edbea32c4cf60d80710bd0eb56728706ac8c8 -r5c7add17cecb0528db91b9c805c95f9372dc341b --- leahi_dialin/dd/modules/dd_test_configs.py (.../dd_test_configs.py) (revision db4edbea32c4cf60d80710bd0eb56728706ac8c8) +++ leahi_dialin/dd/modules/dd_test_configs.py (.../dd_test_configs.py) (revision 5c7add17cecb0528db91b9c805c95f9372dc341b) @@ -17,7 +17,7 @@ from logging import Logger from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.test_config_defs import DDTestConfigOptions +from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from .constants import NO_RESET from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_integer @@ -46,8 +46,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_to_dialin_ch_id - msg_id = MsgIds.MSG_ID_DD_SEND_TEST_CONFIGURATION.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_send_test_config = MsgIds.MSG_ID_DD_SEND_TEST_CONFIGURATION.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_send_test_config, self._handler_dd_test_config_sync) def cmd_get_test_config_status(self, config: int): @@ -57,7 +57,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] def cmd_set_test_config(self, config: int, reset: int = NO_RESET): """ @@ -78,9 +78,9 @@ payload=payload) if reset == NO_RESET: - self.logger.debug("Setting {}".format(DDTestConfigOptions(config).name)) + self.logger.debug("Setting {}".format(DDFPTestConfigOptions(config).name)) else: - self.logger.debug("Resetting {}".format(DDTestConfigOptions(config).name)) + self.logger.debug("Resetting {}".format(DDFPTestConfigOptions(config).name)) # Send message received_message = self.can_interface.send(message) @@ -145,7 +145,7 @@ self.logger.debug("Timeout!!!!") return False - @publish(['dd_test_configs']) + @publish(['msg_id_dd_send_test_config', 'dd_test_configs', 'dd_test_configs_response_timestamp']) def _handler_dd_test_config_sync(self, message, timestamp=0.0): """ Handles published test configuration status messages. @@ -156,7 +156,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 @@ -169,7 +169,7 @@ @return: None """ - for config in DDTestConfigOptions.__members__: + for config in DDFPTestConfigOptions.__members__: # Loop through the list of the test configuration and set the values to 0xFFFFFFFF if 'NUM_OF_TEST_CONFIGS' not in config: self.dd_test_configs[config] = 0xFFFFFFFF \ No newline at end of file