Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rd2998e4771e53fd9fe97273de9a6f36d04fbb7b6 -rfa37e7c7c1796532f07f39ba89da5465a4a8451c --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision d2998e4771e53fd9fe97273de9a6f36d04fbb7b6) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision fa37e7c7c1796532f07f39ba89da5465a4a8451c) @@ -113,6 +113,7 @@ MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA = 0x5B MSG_ID_DD_UF_DATA = 0x5C MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D + MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x5E MSG_ID_DD_BLOOD_LEAK_DATA = 0x60 MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 @@ -240,11 +241,10 @@ MSG_ID_DD_HEATERS_PWM_PERIOD_OVERRIDE_REQUEST = 0xA03C MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03D MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E - MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA03F - MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA040 - MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA041 + MSG_ID_DD_AVAILABLE_TO_USE_3 = 0xA03F + MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA040 + MSG_ID_DD_AVAILABLE_TO_USE_4 = 0xA041 MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042 - MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xA043 MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00 MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01 Index: leahi_dialin/dd/modules/spent_chamber.py =================================================================== diff -u --- leahi_dialin/dd/modules/spent_chamber.py (revision 0) +++ leahi_dialin/dd/modules/spent_chamber.py (revision fa37e7c7c1796532f07f39ba89da5465a4a8451c) @@ -0,0 +1,107 @@ +########################################################################### +# +# 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 spent_chamber.py +# +# @author (last) Jonny Paguio +# @date (last) 26-Aug-2025 +# @author (original) Jonny Paguio +# @date (original) 26-Aug-2025 +# +############################################################################ +import struct +from logging import Logger + +from .constants import RESET, NO_RESET +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.utils.conversions import integer_to_bytearray, float_to_bytearray + +class DDSpentChamber(AbstractSubSystem): + """ + Spent Chamber + + Dialysate Delivery (DD) Dialin API sub-class for Spent Chamber related commands. + """ + def __init__(self, can_interface, logger: Logger): + """ + + @param can_interface: Denali Can Messenger object + """ + super().__init__() + + self.can_interface = can_interface + self.logger = logger + + if self.can_interface is not None: + channel_id = DenaliChannels.dd_sync_broadcast_ch_id + msg_id = MsgIds.MSG_ID_DD_SPENT_CHAMBER_FILL_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self._handler_spent_chamber_sync) + + self.execution_state = 0 + self.switching_period = 0 + self.total_spent_chamber_fill_counter = 0 + self.dd_spent_chamber_timestamp = 0 + + @publish(["dd_spent_chamber_timestamp", + "execution_state", "switching_period", + "total_spent_chamber_fill_counter"]) + def _handler_spent_chamber_sync(self, message, timestamp=0.0): + """ + Handles published spent chamber data messages. + + @param message: published spent chamber data message + @return: None + """ + + self.execution_state = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + self.switching_period = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] + self.total_spent_chamber_fill_counter = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + + self.dd_spent_chamber_timestamp = timestamp + + def cmd_spent_chamber_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the spent chamber data broadcast interval override command + Constraints: + Must be logged into DD. + Given interval must be non-zero and a multiple of the DD general task interval (50 ms). + + @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 + """ + + if not check_broadcast_interval_override_ms(ms): + return False + + reset_byte_array = integer_to_bytearray(reset) + ms_byte_array = integer_to_bytearray(ms) + payload = reset_byte_array + ms_byte_array + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message_id=MsgIds.MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override DD Spent Chamber data broadcast interval") + + # 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.error("Timeout!!!!") + return False \ No newline at end of file