Index: leahi_dialin/td/modules/ejector.py =================================================================== diff -u -r6944f314294da17334cb50aea33b044c83daa95d -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 6944f314294da17334cb50aea33b044c83daa95d) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) @@ -17,12 +17,12 @@ import struct from logging import Logger -from .constants import RESET, NO_RESET +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_broadcast_interval_override, cmd_generic_override from leahi_dialin.common.td_defs import TDEjectorNames, TDEjectorAttributes -from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels +from leahi_dialin.protocols.CAN import DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish -from leahi_dialin.utils.checks import check_broadcast_interval_override_ms from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -58,6 +58,7 @@ } self.td_ejector_timestamp = 0 + @publish(["msg_id_td_ejector_data", "h5_motor", "td_ejector_timestamp"]) def _handler_ejector_sync(self, message, timestamp=0.0): """ @@ -77,6 +78,7 @@ self.td_ejector_timestamp = timestamp + def cmd_ejector_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the ejector motor data broadcast interval override command @@ -88,37 +90,16 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ + return cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = DenaliChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_EJECTOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'TD Ejector', + logger = self.logger, + can_interface = self.can_interface) - if not check_broadcast_interval_override_ms(ms): - return False - rst = integer_to_bytearray(reset) - mis = integer_to_bytearray(ms) - payload = rst + mis - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TD_EJECTOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override TD ejector data broadcast interval") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - if reset == RESET: - str_res = "reset back to normal: " - else: - str_res = str(ms) + " ms: " - self.logger.debug("ejector data broadcast interval overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - def cmd_ejector_request_command(self, cmd: int) -> int: """ Constructs and sends the ejector request command. @@ -135,23 +116,17 @@ idx = integer_to_bytearray(cmd) payload = idx - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TD_EJECTOR_COMMAND.value, - payload=payload) + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_EJECTOR_COMMAND, + entity_name = f'TD Ejector state', + override_text = f'{str(cmd)}', + logger = self.logger, + can_interface = self.can_interface) - self.logger.debug("setting ejector state to" + str(cmd)) - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - def cmd_ejector_set_motor_speed_request(self, speed: int) -> int: """ Constructs and sends the ejector set speed command. Negative values imply reverse ( retract ) direction. @@ -166,23 +141,17 @@ spd = float_to_bytearray(speed) payload = spd - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TD_EJECTOR_MOTOR_SET_SPEED_REQUEST.value, - payload=payload) + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_EJECTOR_MOTOR_SET_SPEED_REQUEST, + entity_name = f'TD Ejector speed', + override_text = f'{str(speed)}', + logger = self.logger, + can_interface = self.can_interface) - self.logger.debug("setting ejector set speed to" + str(spd)) - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - def cmd_ejector_optical_sensor_override(self, sensor: int, sensor_active: int, reset: int = NO_RESET) -> int: """ Constructs and sends the ejector optical sensor override command @@ -206,24 +175,13 @@ active = integer_to_bytearray(sensor_active) payload = rst + active + sen - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TD_EJECTOR_OPT_SENSOR_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("Override sensor ID {} to {}".format(sen, active)) - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - if reset == RESET: - str_res = "reset back to normal. " - else: - str_res = "Override sensor {} to {}".format(sen, active) - self.logger.debug(str_res) - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False + sensor_name = 'H25 Retract' if sensor == 0 else 'H24 Engage' + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_EJECTOR_OPT_SENSOR_OVERRIDE_REQUEST, + entity_name = f'TD Ejector {sensor_name} Optical Sensor', + override_text = f'{str(sensor_active)}', + logger = self.logger, + can_interface = self.can_interface)