Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r3e8c15745640db0568536912a36704a567bd73c2 -rb3c5f38c578a27dd167ca5dd81f140b1083b057e --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 3e8c15745640db0568536912a36704a567bd73c2) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision b3c5f38c578a27dd167ca5dd81f140b1083b057e) @@ -251,6 +251,7 @@ MSG_ID_UI_TD_NVM_SET_USAGE_INFO_RECORD = 0xE5 MSG_ID_TD_NVM_CAL_RESPONSE = 0xE6 MSG_ID_UI_TD_NVM_SET_CAL_RECORD = 0xE7 + MSG_ID_TD_HEMODIAFILTRATION_DATA = 0xE8 MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 @@ -340,6 +341,10 @@ MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST = 0x8060 MSG_ID_TD_GET_ALARM_PROPERTIES_REQUEST = 0x8061 MSG_ID_TD_ALARM_PROPERTIES_RESPONSE = 0x8062 + MSG_ID_TD_HDF_START_STOP_OVERRIDE_REQUEST = 0x8063 + MSG_ID_TD_HDF_CURRENT_RATE_OVERRIDE_REQUEST = 0x8064 + MSG_ID_TD_HDF_TARGET_TMP_OVERRIDE_REQUEST = 0x8065 + MSG_ID_TD_HDF_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8066 MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999 Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r2a8cf0f2bb60b82bf059519526e0b15cd08af022 -rb3c5f38c578a27dd167ca5dd81f140b1083b057e --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 2a8cf0f2bb60b82bf059519526e0b15cd08af022) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision b3c5f38c578a27dd167ca5dd81f140b1083b057e) @@ -1189,7 +1189,31 @@ 'VALVE_STATE_IN_TRANSITION': [], } +@unique +class TDHemodiafiltrationAttributes(DialinEnum): + HDF_EXEC_STATE = 0 # Set Blood Flow Rate for Blood Flow Motor + HDF_REQUESTED_RATE = 1 # Measured Blood Flow Rate for Blood Flow Motor + HDF_TARGET_TMP = 2 # Measured Bloop Pump Rotor Speed for Blood Flow Motor + HDF_CURRENT_RATE = 3 # Measured Blood Pump Speed for Blood Flow Motor + HDF_CURRENT_TMP = 4 # Measured Blood Pump torque + HDF_REQUESTED_VOLUME = 5 # Set Revolutions per minute for Blood Flow Motor + HDF_TOTAL_VOLUME = 6 # Rotor Count for Blood Flow Motor + HDF_REQUESTED = 7 # Pressure Blood Flow Rate for Blood Flow Motor + NUM_OF_HDF_ATTRIBUTES = 8 # Number of Blood Flow Motor Attributes +TDHemodiafiltrationAttributes._str_list = { + # Official Name : Accepted strings + 'HDF_EXEC_STATE': ['hdf state'], + 'HDF_REQUESTED_RATE': ['hdf requested rate'], + 'HDF_TARGET_TMP': ['hdf target tmp'], + 'HDF_CURRENT_RATE': ['hdf current rate'], + 'HDF_CURRENT_TMP': ['hdf current tmp'], + 'HDF_REQUESTED_VOLUME': ['hdf requested volume'], + 'HDF_TOTAL_VOLUME': ['hdf total volume'], + 'HDF_REQUESTED': ['hdf request'], + 'NUM_OF_BLOOD_FLOW_MOTOR_ATTRIBUTES': [], +} + # ================================================== Enum Creators: Treatment Parameters ================================================== @unique class TDTreatmentParameters(DialinEnum): Index: leahi_dialin/common/td_defs_proxy.py =================================================================== diff -u -r2a8cf0f2bb60b82bf059519526e0b15cd08af022 -rb3c5f38c578a27dd167ca5dd81f140b1083b057e --- leahi_dialin/common/td_defs_proxy.py (.../td_defs_proxy.py) (revision 2a8cf0f2bb60b82bf059519526e0b15cd08af022) +++ leahi_dialin/common/td_defs_proxy.py (.../td_defs_proxy.py) (revision b3c5f38c578a27dd167ca5dd81f140b1083b057e) @@ -95,6 +95,7 @@ TDTreatmentParameters = td_defs.TDTreatmentParameters TDTreatmentModalityTypes = td_defs.TDTreatmentModalityTypes TDTreatmentHDFDilution = td_defs.TDTreatmentHDFDilution + TDHemodiafiltrationAttributes = td_defs.TDHemodiafiltrationAttributes # Alarms AlarmProperties = generic_defs.AlarmProperties Index: leahi_dialin/dd/modules/substitution_pump.py =================================================================== diff -u -r7867a1799d96a5803a80c1914b30e34d6a9ee8b7 -rb3c5f38c578a27dd167ca5dd81f140b1083b057e --- leahi_dialin/dd/modules/substitution_pump.py (.../substitution_pump.py) (revision 7867a1799d96a5803a80c1914b30e34d6a9ee8b7) +++ leahi_dialin/dd/modules/substitution_pump.py (.../substitution_pump.py) (revision b3c5f38c578a27dd167ca5dd81f140b1083b057e) @@ -62,7 +62,7 @@ } self.dd_substitution_pump_timestamp = 0 #: The timestamp of the latest message - @publish(["msg_id_dd_rinse_pump_data", + @publish(["msg_id_dd_substitution_pump_data", "dd_substitution_pumps", "dd_substitution_pump_timestamp"]) def _handler_substitution_pump_sync(self, message, timestamp=0.0): Index: leahi_dialin/td/modules/hemodiafiltration.py =================================================================== diff -u --- leahi_dialin/td/modules/hemodiafiltration.py (revision 0) +++ leahi_dialin/td/modules/hemodiafiltration.py (revision b3c5f38c578a27dd167ca5dd81f140b1083b057e) @@ -0,0 +1,183 @@ +########################################################################### +# +# Copyright (c) 2021-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 rinse_pump.py +# +# @author (last) Zoltan Miskolci +# @date (last) 07-Jan-2026 +# @author (original) Jonny Paguio +# @date (original) 13-Oct-2025 +# +############################################################################ + +# Module imports +import struct +from logging import Logger + +# Project imports +from leahi_dialin.common.constants import NO_RESET +from leahi_dialin.common import td_enum_repository +from leahi_dialin.common.generic_defs import DataTypes +from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels +from leahi_dialin.utils.abstract_classes import AbstractSubSystem +from leahi_dialin.utils.base import publish +from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray + + +class TDHemoDiaFiltration(AbstractSubSystem): + """ + HDF module + + HemoDiaFiltration (TD) Dialin API sub-class for HDF related commands. + """ + + def __init__(self, can_interface: CanMessenger, 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: + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, + message_id = MsgIds.MSG_ID_TD_HEMODIAFILTRATION_DATA.value, + function = self._handler_hdf_sync) + self.td_hdf_data = { + td_enum_repository.TDHemodiafiltrationAttributes.HDF_EXEC_STATE: 0, + td_enum_repository.TDHemodiafiltrationAttributes.HDF_REQUESTED_RATE: 0.0, + td_enum_repository.TDHemodiafiltrationAttributes.HDF_TARGET_TMP: 0.0, + td_enum_repository.TDHemodiafiltrationAttributes.HDF_CURRENT_RATE: 0.0, + td_enum_repository.TDHemodiafiltrationAttributes.HDF_CURRENT_TMP: 0.0, + td_enum_repository.TDHemodiafiltrationAttributes.HDF_REQUESTED_VOLUME: 0.0, + td_enum_repository.TDHemodiafiltrationAttributes.HDF_TOTAL_VOLUME: 0.0, + td_enum_repository.TDHemodiafiltrationAttributes.HDF_REQUESTED: 0, + } + + self.td_hdf_timestamp = 0 #: The timestamp of the latest message + + @publish(["msg_id_td_hemodiafiltration_data", + "td_hdf", + "td_hdf_timestamp"]) + def _handler_hdf_sync(self, message, timestamp=0.0): + """ + Handles published hdf data messages. + + @param message: published hdf data message + @return: None + """ + + hdf_list = [] + hdf_list.append((td_enum_repository.TDHemodiafiltrationAttributes.HDF_EXEC_STATE, DataTypes.U32)) + hdf_list.append((td_enum_repository.TDHemodiafiltrationAttributes.HDF_REQUESTED_RATE, DataTypes.F32)) + hdf_list.append((td_enum_repository.TDHemodiafiltrationAttributes.HDF_TARGET_TMP, DataTypes.F32)) + hdf_list.append((td_enum_repository.TDHemodiafiltrationAttributes.HDF_CURRENT_RATE, DataTypes.F32)) + hdf_list.append((td_enum_repository.TDHemodiafiltrationAttributes.HDF_CURRENT_TMP, DataTypes.F32)) + hdf_list.append((td_enum_repository.TDHemodiafiltrationAttributes.HDF_REQUESTED_VOLUME, DataTypes.F32)) + hdf_list.append((td_enum_repository.TDHemodiafiltrationAttributes.HDF_TOTAL_VOLUME, DataTypes.F32)) + hdf_list.append((td_enum_repository.TDHemodiafiltrationAttributes.HDF_REQUESTED, DataTypes.U32)) + + + self.process_into_dict(dict_to_update = self.td_hdf_data, + decoder_list = hdf_list, + message = message) + + self.td_hdf_timestamp = timestamp + + def cmd_hdf_data_publish_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the substitution pump data publish 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 + """ + return cmd_generic_broadcast_interval_override( + ms=ms, + reset=reset, + channel_id=CanChannels.dialin_to_td_ch_id, + msg_id=MsgIds.MSG_ID_TD_HDF_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name='TD HDF', + logger=self.logger, + can_interface=self.can_interface) + + def cmd_hdf_set_start_stop(self, command: int, target_tmp: float, volume: float, speed: float) -> int: + """ + Constructs and sends the substitution pump start stop command + + @param command: int - value to command the substitution pump + @param target_tmp: float - target transmembrane pressure that pump will control to + @param volume: float - target total volume to deliver. + @param speed: float - ml/min to set the speed to. Used for open loop control only and will take precendence + over closed control if non-zero. + @return: 1 if successful, zero otherwise + """ + cmd = integer_to_bytearray(command) + tgt = float_to_bytearray(target_tmp) + vol = float_to_bytearray(volume) + spd = float_to_bytearray(speed) + payload = cmd + tgt + vol + spd + + return cmd_generic_override( + payload=payload, + reset=NO_RESET, + channel_id=CanChannels.dialin_to_td_ch_id, + msg_id=MsgIds.MSG_ID_TD_HDF_START_STOP_OVERRIDE_REQUEST, + entity_name=f'TD HDF start stop request', + override_text=str(spd), + logger=self.logger, + can_interface=self.can_interface) + + def cmd_hdf_target_tmp_override_request(self, tmp: int) -> int: + """ + Constructs and sends the HDF target TMP override. + Constraints: + Must be logged into TD. + + @param tmp: float + @return: 1 if successful, zero otherwise + """ + trans = float_to_bytearray(tmp) + payload = trans + + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = CanChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_SET_SPEED_REQUEST, + entity_name = f'TD Target Tmp', + override_text = f'{str(trans)}', + logger = self.logger, + can_interface = self.can_interface) + + def cmd_hdf_current_rate_request(self, rpm: int) -> int: + """ + Constructs and sends the hdf current command + Constraints: + Must be logged into TD. + + @param rpm: integer - speed in ml/min. + @return: 1 if successful, zero otherwise + """ + rpm = integer_to_bytearray(rpm) + payload = rpm + + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = CanChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_SET_SPEED_REQUEST, + entity_name = f'TD rate', + override_text = f'{str(rpm)}', + logger = self.logger, + can_interface = self.can_interface) Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -r3e8c15745640db0568536912a36704a567bd73c2 -rb3c5f38c578a27dd167ca5dd81f140b1083b057e --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 3e8c15745640db0568536912a36704a567bd73c2) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision b3c5f38c578a27dd167ca5dd81f140b1083b057e) @@ -28,6 +28,7 @@ from .modules.buttons import TDButtons from .modules.ejector import TDEjector from .modules.events import TDEvents +from .modules.hemodiafiltration import TDHemoDiaFiltration from .modules.pressure_sensors import TDPressureSensors from .modules.switches import TDSwitches from .modules.syringe_pump import TDSyringePump @@ -135,6 +136,7 @@ self.buttons = TDButtons(self.can_interface, self.logger) #: The Buttons module self.ejector = TDEjector(self.can_interface, self.logger) #: The Ejector module self.events = TDEvents(self.can_interface, self.logger) #: The Events module + self.hdf = TDHemoDiaFiltration(self.can_interface, self.logger) self.pressure_sensors = TDPressureSensors(self.can_interface, self.logger) #: The Pressure Sensors module self.switches = TDSwitches(self.can_interface, self.logger) #: The Switches module self.syringe_pump = TDSyringePump(self.can_interface, self.logger) #: The Syringe Pump module