Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r809b92241a33a60e8b04968b2484deed871f6f69 -r410054cfec7aee839266233249413b08b368fbd3 --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 809b92241a33a60e8b04968b2484deed871f6f69) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 410054cfec7aee839266233249413b08b368fbd3) @@ -7,8 +7,8 @@ # # @file levels.py # -# @author (last) Michael Garthwaite -# @date (last) 28-Oct-2024 +# @author (last) Zoltan Miskolci +# @date (last) 07-Jan-2026 # @author (original) Dara Navaei # @date (original) 29-May-2020 # @@ -18,10 +18,10 @@ from logging import Logger from leahi_dialin.common.constants import NO_RESET -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.dd_defs import DDLevelSensorEnum -from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override -from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels +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.protocols.CAN import DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -79,6 +79,7 @@ self.dd_levels_timestamp = timestamp + def cmd_levels_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends dd levels broadcast time interval override. @@ -90,15 +91,16 @@ @param reset: (int) 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise """ - cmd_generic_broadcast_interval_override( + return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, channel_id = DenaliChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, - module_name = 'DD level sensors', + module_name = 'DD Levels', logger = self.logger, can_interface = self.can_interface) - + + def cmd_level_status_override(self, level_sensor: int, status: int, reset: int = NO_RESET) -> int: """ Constructs and sends level status cycle override command @@ -113,16 +115,14 @@ level_sensor = integer_to_bytearray(level_sensor) sts = integer_to_bytearray(status) payload = reset_value + sts + level_sensor - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_LEVELS_STATUS_OVERRIDE_REQUEST.value, - payload=payload) - 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 + sensor_name = DDLevelSensorEnum(level_sensor).name.split('_')[0] + return cmd_generic_override( + payload = payload, + reset = reset, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_LEVELS_STATUS_OVERRIDE_REQUEST, + entity_name = f'DD {sensor_name} Level Status', + override_text = str(status), + logger = self.logger, + can_interface = self.can_interface)