Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -ra6c8026470fbbead9a90b727be257d3076397670 -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision a6c8026470fbbead9a90b727be257d3076397670) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a) @@ -7,22 +7,22 @@ # # @file temperature_sensors.py # -# @author (last) Micahel Garthwaite -# @date (last) 28-Jul-2023 +# @author (last) Zoltan Miskolci +# @date (last) 09-Jan-2026 # @author (original) Dara Navaei # @date (original) 01-Dec-2021 # ############################################################################ + import struct -from enum import unique from logging import Logger -from .constants import NO_RESET, RESET -from leahi_dialin.common.fp_defs import FPTemperaturesNames, BETA_CONDUCTIVITY_SENSOR_OFFSET, BETA_FLOW_SENSOR_OFFSET, BETA_IO_PRES_SENSOR_OFFSET, BETA_FP_PRES_SENSOR_OFFSET +from leahi_dialin.common.constants import NO_RESET +from leahi_dialin.common.fp_defs import FPTemperaturesNames, BETA_IOFP_COND_SENSOR_OFFSET, BETA_IOFP_PRES_SENSOR_OFFSET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels -from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum -from leahi_dialin.utils.checks import check_broadcast_interval_override_ms +from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override +from leahi_dialin.protocols.CAN import DenaliChannels +from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -54,6 +54,7 @@ FPTemperaturesNames.P46_TEMP.name: 0.0 } + @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): """ @@ -91,6 +92,7 @@ self.fp_temperature_sensors_timestamp = timestamp + def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends broadcast time interval. @@ -102,30 +104,16 @@ @param reset: (int) 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise """ - if not check_broadcast_interval_override_ms(ms): - return False + return cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = MsgIds.MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'FP Temperature Sensors', + logger = self.logger, + can_interface = self.can_interface) - reset_value = integer_to_bytearray(reset) - interval_value = integer_to_bytearray(ms) - payload = reset_value + interval_value - message = DenaliMessage.build_message( - channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("Sending {} ms publish interval to the Temperature Sensors module".format(ms)) - # Send message - received_message = self.can_interface.send(message) - - # If there is content in message - if received_message is not None: - # Response payload is OK or not - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - def cmd_temperatures_value_override(self, sensor_index: int, sensor_value: float, reset: int = NO_RESET) -> int: """ Constructs and sends the value override of a temperature sensor. @@ -137,49 +125,35 @@ @param sensor_value: (float) Value of the sensor to override @param reset: (int) whether to reset the override value. The default is NO_RESET @returns 1 if successful, zero otherwise - """ - rst = integer_to_bytearray(reset) - value = float_to_bytearray(sensor_value) + # FP Conductivity Sensors' Temperature Override - if FPTemperaturesNames.P10_TEMP.value <= sensor_index <= FPTemperaturesNames.P19_TEMP.value: - index = integer_to_bytearray(sensor_index + BETA_CONDUCTIVITY_SENSOR_OFFSET) - payload = rst + value + index - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST.value, - payload=payload) + if FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= FPTemperaturesNames.LAST_CONDUCTIVITY_SENSOR.value: + index = integer_to_bytearray(sensor_index - FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET) + msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST + # FP Flow Sensors' Temperature Override - elif FPTemperaturesNames.P7_TEMP.value <= sensor_index < FPTemperaturesNames.NUM_OF_TEMPERATURE_SENSORS.value: - index = integer_to_bytearray(sensor_index - BETA_FLOW_SENSOR_OFFSET) - payload = rst + value + index - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST.value, - payload=payload) - # IO Pressure Sensors' Temperature Override - elif FPTemperaturesNames.M1_TEMP.value <= sensor_index <= FPTemperaturesNames.M3_TEMP.value: - index = integer_to_bytearray(sensor_index + BETA_IO_PRES_SENSOR_OFFSET) - payload = rst + value + index - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST.value, - payload=payload) + elif FPTemperaturesNames.FIRST_FLOW_SENSOR.value <= sensor_index < FPTemperaturesNames.LAST_FLOW_SENSOR.value: + index = integer_to_bytearray(sensor_index - FPTemperaturesNames.FIRST_FLOW_SENSOR.value) + msg_id = MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST + # FP Pressure Sensors' Temperature Override else: - index = integer_to_bytearray(sensor_index + BETA_FP_PRES_SENSOR_OFFSET) - payload = rst + value + index - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("Setting sensor {} to {} C".format(FPTemperaturesNames[str(sensor_index)].name, sensor_value)) - - # Send message - received_message = self.can_interface.send(message) - - # If there is content in message - if received_message is not None: - # Response payload is OK or not - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False \ No newline at end of file + index = integer_to_bytearray(sensor_index - FPTemperaturesNames.FIRST_PRESSURE_SENSOR.value + BETA_IOFP_PRES_SENSOR_OFFSET) + msg_id = MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST + + rst = integer_to_bytearray(reset) + value = float_to_bytearray(sensor_value) + payload = rst + value + index + + valve_name = FPTemperaturesNames(sensor_index).name.split('_')[0] + return cmd_generic_override( + payload = payload, + reset = reset, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = msg_id, + entity_name = f'FP {valve_name} Temperature Sensor temperature', + override_text = str(sensor_value), + logger = self.logger, + can_interface = self.can_interface)