From 90798a7cb6ab003b351b8b9d6b848ad96f06e7c6 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 30 Oct 2015 17:08:12 +0100 Subject: [PATCH] Revert "Do not check component ID for mission handling partner" This reverts commit e0e7a2414e6195fb59c973c443fee304f70afc63. --- src/modules/mavlink/mavlink_mission.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/mavlink/mavlink_mission.cpp b/src/modules/mavlink/mavlink_mission.cpp index d710558ef0..7e9f546d26 100644 --- a/src/modules/mavlink/mavlink_mission.cpp +++ b/src/modules/mavlink/mavlink_mission.cpp @@ -403,7 +403,7 @@ MavlinkMissionManager::handle_mission_ack(const mavlink_message_t *msg) mavlink_msg_mission_ack_decode(msg, &wpa); if (CHECK_SYSID_COMPID_MISSION(wpa)) { - if ((msg->sysid == _transfer_partner_sysid/* && msg->compid == _transfer_partner_compid*/)) { + if ((msg->sysid == _transfer_partner_sysid && msg->compid == _transfer_partner_compid)) { if (_state == MAVLINK_WPM_STATE_SENDLIST) { _time_last_recv = hrt_absolute_time(); @@ -504,7 +504,7 @@ MavlinkMissionManager::handle_mission_request(const mavlink_message_t *msg) mavlink_msg_mission_request_decode(msg, &wpr); if (CHECK_SYSID_COMPID_MISSION(wpr)) { - if (msg->sysid == _transfer_partner_sysid/* && msg->compid == _transfer_partner_compid*/) { + if (msg->sysid == _transfer_partner_sysid && msg->compid == _transfer_partner_compid) { if (_state == MAVLINK_WPM_STATE_SENDLIST) { _time_last_recv = hrt_absolute_time();