Index: leahi_dialin/td/modules/temperature_sensors.py =================================================================== diff -u -r6e0b0571d3f4064c8d7bb2b737e326c460780759 -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 --- leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 6e0b0571d3f4064c8d7bb2b737e326c460780759) +++ leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) @@ -1,13 +1,28 @@ +########################################################################### +# +# Copyright (c) 2020-2025 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file temperature_sensors.py +# +# @author (last) Zoltan Miskolci +# @date (last) 08-Jan-2026 +# @author (original) Dara Navaei +# @date (original) 09-Nov-2020 +# +############################################################################ import struct from logging import Logger from .constants import RESET, 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 TDTemperatureSensorNames -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 @@ -33,6 +48,7 @@ self.td_temperatures_status = {TDTemperatureSensorNames.H23_TEMP.name: 0.0} self.td_temperature_timestamp = 0.0 + @publish(["msg_id_td_temperature_data", "td_temperatures_status", "td_temperature_timestamp" @@ -51,86 +67,52 @@ self.td_temperatures_status[TDTemperatureSensorNames.H23_TEMP.name] = baro self.td_temperature_timestamp = timestamp - def cmd_temperature_sensor_override(self, sensor: int, temperature: float, reset: int = NO_RESET) -> int: + + def cmd_temperature_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ - Constructs and sends the measured temperature sensor override command - . + Constructs and sends the measured temperature sensors broadcast interval override command Constraints: Must be logged into TD. + Given interval must be non-zero and a multiple of the TD general task interval (50 ms). - @param sensor: int - sensor ID - @param temperature: float - measured temperature in C + @param ms: integer - interval (in ms) to override with @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_TEMPERATURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'TD Temperature Sensors', + logger = self.logger, + can_interface = self.can_interface) - rst = integer_to_bytearray(reset) - sen = integer_to_bytearray(sensor) - prs = float_to_bytearray(temperature) - payload = rst + prs + sen - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TD_TEMPERATURE_OVERRIDE.value, - payload=payload) - - self.logger.debug("override temperature sensor") - - # 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(prs) + " C. " - self.logger.debug("temperature (measured)) 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_temperature_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + def cmd_temperature_sensor_override(self, sensor: int, temperature: float, reset: int = NO_RESET) -> int: """ - Constructs and sends the measured temperature sensors broadcast interval override command + Constructs and sends the measured temperature sensor override command + . Constraints: Must be logged into TD. - Given interval must be non-zero and a multiple of the TD general task interval (50 ms). - @param ms: integer - interval (in ms) to override with + @param sensor: int - sensor ID + @param temperature: float - measured temperature in C @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - - if not check_broadcast_interval_override_ms(ms): - return False - rst = integer_to_bytearray(reset) - mis = integer_to_bytearray(ms) - payload = rst + mis + sen = integer_to_bytearray(sensor) + prs = float_to_bytearray(temperature) + payload = rst + prs + sen - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TD_TEMPERATURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override temperature sensors broadcast interval") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # self.logger.debug(received_message) - if reset == RESET: - str_res = "reset back to normal: " - else: - str_res = str(ms) + " ms: " - self.logger.debug("Temperature sensors 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 \ No newline at end of file + sensor_name = TDTemperatureSensorNames(sensor).name.split('_')[0] + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_TEMPERATURE_OVERRIDE, + entity_name = f'TD {sensor_name} Temperature Sensor temperature', + override_text = f'{str(temperature)} C', + logger = self.logger, + can_interface = self.can_interface)