Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) @@ -57,8 +57,8 @@ 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.hd_blood_leak_status_timestamp = 0.0 - self.hd_blood_leak_emb_mode_response_timestamp = 0.0 + 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 = DDBloodLeakStates.BLOOD_LEAK_INIT_STATE.value self.blood_leak_emb_mode_cmds = dict() @@ -106,10 +106,11 @@ else: self.logger.debug("Invalid command!") - @publish(['msg_id_dd_blood_leak_data', 'hd_blood_leak_status_timestamp', 'blood_leak_status', 'blood_leak_state', + @publish(['msg_id_dd_blood_leak_data', 'blood_leak_status', 'blood_leak_state', 'blood_leak_error_persistent_ctr', 'blood_leak_serial_comm_state', 'blood_leak_intensity', 'blood_leak_blood_detect', 'blood_leak_intensity_moving_average', 'blood_leak_time_since_last_zero_ms', - 'blood_leak_in_range_drift_status', 'blood_leak_upper_range_drift_status']) + 'blood_leak_in_range_drift_status', 'blood_leak_upper_range_drift_status', + 'dd_blood_leak_status_timestamp',]) def _handler_blood_leak_sync(self, message, timestamp=0.0): """ Handles published blood leak status messages. Blood leak status is captured @@ -138,7 +139,7 @@ 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.hd_blood_leak_status_timestamp = timestamp + self.dd_blood_leak_status_timestamp = timestamp def cmd_blood_leak_detector_override(self, detected: int, reset=NO_RESET): """ @@ -295,7 +296,8 @@ else: self.logger.debug("Invalid command!") - @publish(['msg_id_dd_send_blood_leak_emb_mode_response', 'hd_blood_leak_emb_mode_response_timestamp', 'blood_leak_emb_mode_cmd_response']) + @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): """ Handles published blood leak status messages. Blood leak status is captured @@ -317,7 +319,7 @@ blood_leak_emb_mode_cmd_response += chr(char) self.blood_leak_emb_mode_cmds[EmbModeCommands(cmd).name] = blood_leak_emb_mode_cmd_response - self.hd_blood_leak_emb_mode_response_timestamp = timestamp + self.dd_blood_leak_emb_mode_response_timestamp = timestamp def cmd_blood_leak_emb_mode_info_cmds_override(self, cmd: int, value_to_override: int, reset=NO_RESET): """