Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r56cd024ca23456ab0ae5f6acd30cb4cde02beb4a -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 56cd024ca23456ab0ae5f6acd30cb4cde02beb4a) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -7,38 +7,34 @@ # # @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 # ############################################################################ import struct -from enum import unique from logging import Logger -from .constants import NO_RESET -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.dd_defs import DDLevelSensorEnum -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.utils.conversions import integer_to_bytearray, float_to_bytearray +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 class DDLevels(AbstractSubSystem): """ - Dialysate Delivery (DD) Dialin API sub-class for levels related commands. """ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali CAN Messenger object """ - super().__init__() self.can_interface = can_interface @@ -52,13 +48,14 @@ self.dd_level_sensors = { DDLevelSensorEnum.D6_LEVEL.name: 0, DDLevelSensorEnum.D63_LEVEL.name: 0, + DDLevelSensorEnum.D98_LEVEL.name: 0, DDLevelSensorEnum.D46_LEVEL.name: 0 } - + self.dd_bicarb_level = 0 self.dd_levels_timestamp = 0 - @publish(["msg_id_dd_level_data", "dd_level_sensors", "dd_levels_timestamp"]) + @publish(["msg_id_dd_level_data", "dd_level_sensors", "dd_bicarb_level", "dd_levels_timestamp"]) def _handler_levels_sync(self, message, timestamp=0.0): """ Handles published levels message @@ -70,11 +67,16 @@ message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.dd_level_sensors[DDLevelSensorEnum.D63_LEVEL.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.dd_level_sensors[DDLevelSensorEnum.D46_LEVEL.name] = struct.unpack('i', bytearray( + self.dd_level_sensors[DDLevelSensorEnum.D98_LEVEL.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + self.dd_bicarb_level = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + self.dd_level_sensors[DDLevelSensorEnum.D46_LEVEL.name] = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] 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. @@ -86,29 +88,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_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'DD Levels', + 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_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("Sending {} ms publish interval to the Levels 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_level_status_override(self, level_sensor: int, status: int, reset: int = NO_RESET) -> int: """ Constructs and sends level status cycle override command @@ -123,16 +112,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)