Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -48,13 +48,13 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_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) channel_id = DenaliChannels.dd_to_dialin_ch_id - msg_id = MsgIds.MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE.value - self.can_interface.register_receiving_publication_function(channel_id, msg_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.hd_blood_leak_status_timestamp = 0.0 @@ -106,7 +106,7 @@ else: self.logger.debug("Invalid command!") - @publish(['hd_blood_leak_status_timestamp', 'blood_leak_status', 'blood_leak_state', + @publish(['msg_id_dd_blood_leak_data', 'hd_blood_leak_status_timestamp', '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']) @@ -295,7 +295,7 @@ else: self.logger.debug("Invalid command!") - @publish(['hd_blood_leak_emb_mode_response_timestamp', 'blood_leak_emb_mode_cmd_response']) + @publish(['msg_id_dd_send_blood_leak_emb_mode_response', 'hd_blood_leak_emb_mode_response_timestamp', 'blood_leak_emb_mode_cmd_response']) def _handler_blood_leak_emb_mode_cmd_resp(self, message, timestamp=0.0): """ Handles published blood leak status messages. Blood leak status is captured