Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1) @@ -8,22 +8,26 @@ # @file blood_leak.py # # @author (last) Zoltan Miskolci -# @date (last) 07-Jan-2026 +# @date (last) 04-May-2026 # @author (original) Dara Navaei # @date (original) 21-Aug-2025 # ############################################################################ -import struct +# Module imports from logging import Logger from enum import unique +# Project imports from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common import dd_enum_repository +from leahi_dialin.common.generic_defs import DataTypes 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, DialinEnum +from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels +from leahi_dialin.utils.abstract_classes import AbstractSubSystem +from leahi_dialin.utils.base import publish +from leahi_dialin.utils.enums import DialinEnum from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_byte, bytearray_to_integer, \ unsigned_short_to_bytearray, byte_to_bytearray, float_to_bytearray @@ -54,7 +58,7 @@ BLOOD_LEAK_DETECTED = 0 # Blood detected NO_BLOOD_LEAK_DETECTED = 1 # No blood detected - def __init__(self, can_interface, logger: Logger): + def __init__(self, can_interface: DenaliCanMessenger, logger: Logger): """ @param can_interface: Leahi Can Messenger object """ @@ -63,15 +67,13 @@ self.logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.dd_sync_broadcast_ch_id - self.msg_id_dd_blood_leak_data = MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_blood_leak_data, - self._handler_blood_leak_sync) + self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id, + message_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA.value, + function = self._handler_blood_leak_sync) - channel_id = DenaliChannels.dd_to_dialin_ch_id - self.msg_id_dd_send_blood_leak_emb_mode_response = MsgIds.MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE.value - self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_send_blood_leak_emb_mode_response, - self._handler_blood_leak_emb_mode_cmd_resp) + self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_to_dialin_ch_id, + message_id = MsgIds.MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE.value, + function = self._handler_blood_leak_emb_mode_cmd_resp) self.dd_blood_leak_status_timestamp = 0.0 #: The timestamp of the last Blood Leak data message self.dd_blood_leak_emb_mode_response_timestamp = 0.0 #: The timestamp of the last Emb Mode response message @@ -140,29 +142,24 @@ @param message: published blood leak status message @return: None """ - self.blood_leak_status = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.blood_leak_state = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.blood_leak_error_persistent_ctr = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.blood_leak_serial_comm_state = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.blood_leak_intensity = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.blood_leak_blood_detect = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.blood_leak_intensity_moving_average = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.blood_leak_time_elapsed_since_last_drift_zero_ms = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.blood_leak_in_range_drift_status = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.blood_leak_upper_range_drift_status = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.dd_blood_leak_status_timestamp = timestamp + msg_list =[] + msg_list.append(('self.blood_leak_status', DataTypes.U32)) + msg_list.append(('self.blood_leak_state', DataTypes.U32)) + msg_list.append(('self.blood_leak_error_persistent_ctr', DataTypes.U32)) + msg_list.append(('self.blood_leak_serial_comm_state', DataTypes.U32)) + msg_list.append(('self.blood_leak_intensity', DataTypes.U32)) + msg_list.append(('self.blood_leak_blood_detect', DataTypes.U32)) + msg_list.append(('self.blood_leak_intensity_moving_average', DataTypes.F32)) + msg_list.append(('self.blood_leak_time_elapsed_since_last_drift_zero_ms', DataTypes.U32)) + msg_list.append(('self.blood_leak_in_range_drift_status', DataTypes.U32)) + msg_list.append(('self.blood_leak_upper_range_drift_status', DataTypes.U32)) + self.process_into_vars(decoder_list = msg_list, + message = message) + self.dd_conductivity_timestamp = timestamp + + @publish(['msg_id_dd_send_blood_leak_emb_mode_response', 'blood_leak_emb_mode_cmd_response', 'dd_blood_leak_emb_mode_response_timestamp']) def _handler_blood_leak_emb_mode_cmd_resp(self, message, timestamp=0.0):