Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r41de945f9c773e54e965e80d9e46def828beb732 -r20c821bd230fc7689a0275a2918981669ff5cc19 --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 41de945f9c773e54e965e80d9e46def828beb732) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) @@ -19,7 +19,7 @@ from enum import unique from leahi_dialin.common.constants import NO_RESET -from leahi_dialin.common.dd_defs import dd_enum_repository +from leahi_dialin.common import dd_enum_repository 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 @@ -73,19 +73,19 @@ 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.dd_blood_leak_status_timestamp = 0.0 - self.dd_blood_leak_emb_mode_response_timestamp = 0.0 - self.blood_leak_status = self.NO_BLOOD_LEAK_DETECTED - self.blood_leak_state = dd_enum_repository.DDBloodLeakStates.BLOOD_LEAK_INIT_STATE.value - self.blood_leak_emb_mode_cmds = dict() - self.blood_leak_error_persistent_ctr = 0 - self.blood_leak_serial_comm_state = 0 - self.blood_leak_intensity = 0 - self.blood_leak_blood_detect = 0 - self.blood_leak_intensity_moving_average = 0.0 - self.blood_leak_in_range_drift_status = 0 - self.blood_leak_upper_range_drift_status = 0 - self.blood_leak_time_elapsed_since_last_drift_zero_ms = 0 + 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 + self.blood_leak_status = self.NO_BLOOD_LEAK_DETECTED #: The Blood leak status + self.blood_leak_state = dd_enum_repository.DDBloodLeakStates.BLOOD_LEAK_INIT_STATE.value #: The Blood leak state + self.blood_leak_emb_mode_cmds = dict() #: The Blood leak Emb mode commands in dictionary format + self.blood_leak_error_persistent_ctr = 0 #: The Blood leak error persistent counter + self.blood_leak_serial_comm_state = 0 #: The Blood leak serial communication state + self.blood_leak_intensity = 0 #: The Blood leak intensity + self.blood_leak_blood_detect = 0 #: The Blood leak blood detected or not + self.blood_leak_intensity_moving_average = 0.0 #: The Blood leak intensity moving average + self.blood_leak_in_range_drift_status = 0 #: The Blood leak in range drift status + self.blood_leak_upper_range_drift_status = 0 #: The Blood leak upper range drift status + self.blood_leak_time_elapsed_since_last_drift_zero_ms = 0 #: The Elapsed time since the last zeroing in ms for cmd in EmbModeCommands.__members__: # Initialize all the embedded mode commands