Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-24 09:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: removed use of mavlink_check_target()

Browse Source
This commit is contained in:
Andrew Tridgell 2014-12-10 14:04:10 +11:00 committed by Randy Mackay
parent f1edd1bafb
commit 507117bd8f
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ArduPlane/GCS_Mavlink.pde
View File

@ -1009,7 +1009,6 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
// decode // decode
mavlink_command_long_t packet; mavlink_command_long_t packet;
mavlink_msg_command_long_decode(msg, &packet); mavlink_msg_command_long_decode(msg, &packet);
if (mavlink_check_target(packet.target_system, packet.target_component)) break;
uint8_t result = MAV_RESULT_UNSUPPORTED; uint8_t result = MAV_RESULT_UNSUPPORTED;
@ -1340,8 +1339,6 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
case MAVLINK_MSG_ID_FENCE_POINT: { case MAVLINK_MSG_ID_FENCE_POINT: {
mavlink_fence_point_t packet; mavlink_fence_point_t packet;
mavlink_msg_fence_point_decode(msg, &packet); mavlink_msg_fence_point_decode(msg, &packet);
if (mavlink_check_target(packet.target_system, packet.target_component))
break;
if (g.fence_action != FENCE_ACTION_NONE) { if (g.fence_action != FENCE_ACTION_NONE) {
send_text_P(SEVERITY_LOW,PSTR("fencing must be disabled")); send_text_P(SEVERITY_LOW,PSTR("fencing must be disabled"));
} else if (packet.count != g.fence_total) { } else if (packet.count != g.fence_total) {
@ -1359,8 +1356,6 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
case MAVLINK_MSG_ID_FENCE_FETCH_POINT: { case MAVLINK_MSG_ID_FENCE_FETCH_POINT: {
mavlink_fence_fetch_point_t packet; mavlink_fence_fetch_point_t packet;
mavlink_msg_fence_fetch_point_decode(msg, &packet); mavlink_msg_fence_fetch_point_decode(msg, &packet);
if (mavlink_check_target(packet.target_system, packet.target_component))
break;
if (packet.idx >= g.fence_total) { if (packet.idx >= g.fence_total) {
send_text_P(SEVERITY_LOW,PSTR("bad fence point")); send_text_P(SEVERITY_LOW,PSTR("bad fence point"));
} else { } else {
@ -1376,8 +1371,6 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
case MAVLINK_MSG_ID_RALLY_POINT: { case MAVLINK_MSG_ID_RALLY_POINT: {
mavlink_rally_point_t packet; mavlink_rally_point_t packet;
mavlink_msg_rally_point_decode(msg, &packet); mavlink_msg_rally_point_decode(msg, &packet);
if (mavlink_check_target(packet.target_system, packet.target_component))
break;
if (packet.idx >= rally.get_rally_total() || if (packet.idx >= rally.get_rally_total() ||
packet.idx >= rally.get_rally_max()) { packet.idx >= rally.get_rally_max()) {
@ -1405,8 +1398,6 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
case MAVLINK_MSG_ID_RALLY_FETCH_POINT: { case MAVLINK_MSG_ID_RALLY_FETCH_POINT: {
mavlink_rally_fetch_point_t packet; mavlink_rally_fetch_point_t packet;
mavlink_msg_rally_fetch_point_decode(msg, &packet); mavlink_msg_rally_fetch_point_decode(msg, &packet);
if (mavlink_check_target(packet.target_system, packet.target_component))
break;
if (packet.idx > rally.get_rally_total()) { if (packet.idx > rally.get_rally_total()) {
send_text_P(SEVERITY_LOW, PSTR("bad rally point index")); send_text_P(SEVERITY_LOW, PSTR("bad rally point index"));
break; break;
@ -1441,10 +1432,6 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
int16_t v[8]; int16_t v[8];
mavlink_msg_rc_channels_override_decode(msg, &packet); mavlink_msg_rc_channels_override_decode(msg, &packet);
// exit immediately if this command is not meant for this vehicle
if (mavlink_check_target(packet.target_system,packet.target_component))
break;
v[0] = packet.chan1_raw; v[0] = packet.chan1_raw;
v[1] = packet.chan2_raw; v[1] = packet.chan2_raw;
v[2] = packet.chan3_raw; v[2] = packet.chan3_raw;