Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422 --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422) @@ -8,22 +8,27 @@ # @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.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.generic_defs import DataTypes +from leahi_dialin.common.msg_defs import MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds 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 CanMessenger, CanChannels +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 +59,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: CanMessenger, logger: Logger): """ @param can_interface: Leahi Can Messenger object """ @@ -63,15 +68,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 = CanChannels.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 = CanChannels.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 +143,23 @@ @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): @@ -203,7 +200,7 @@ return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, module_name = 'DD Blood Leak', logger = self.logger, @@ -227,7 +224,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST, entity_name = 'DD Blood Leak Detector state', override_text = str(detected), @@ -246,7 +243,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST, entity_name = 'DD Blood Leak Zeroing', override_text = 'Active', @@ -265,7 +262,7 @@ return cmd_generic_override( payload = None, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST, entity_name = 'DD Blood Leak Embedded mode', override_text = 'Active', @@ -298,7 +295,7 @@ return cmd_generic_override( payload = payload, reset = NO_RESET, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_SET_EMBEDDED_MODE_CMD_REQUEST, entity_name = f'DD {str(EmbModeCommands(command).name)} to the blood leak sensor', override_text = 'Active', @@ -326,7 +323,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST, entity_name = f'DD Blood Leak {EmbModeCommands(cmd).name}', override_text = str(value_to_override), @@ -351,7 +348,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST, entity_name = 'DD Blood Leak Intensity Moving Average', override_text = str(value), @@ -379,7 +376,7 @@ return cmd_generic_override( payload = payload, reset = reset, - channel_id = DenaliChannels.dialin_to_dd_ch_id, + channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST, entity_name = f'DD Blood Leak Zeroing {text} interval', override_text = f'{str(value_mins)} minutes',