Browse Source

Rover: guided mode more forgiving of set-position-targets type_mask field

accept position targets regardless of any other bit settings in type mask field.  This makes rover more forgiving of errors in the type_mask field.
mission-4.1.18
Randy Mackay 7 years ago
parent
commit
1e058045f7
  1. 4
      APMrover2/GCS_Mavlink.cpp

4
APMrover2/GCS_Mavlink.cpp

@ -962,7 +962,7 @@ void GCS_MAVLINK_Rover::handleMessage(mavlink_message_t* msg) @@ -962,7 +962,7 @@ void GCS_MAVLINK_Rover::handleMessage(mavlink_message_t* msg)
}
// set guided mode targets
if (!pos_ignore && vel_ignore && acc_ignore && yaw_ignore && yaw_rate_ignore) {
if (!pos_ignore) {
// consume position target
rover.mode_guided.set_desired_location(target_loc);
} else if (pos_ignore && !vel_ignore && acc_ignore && yaw_ignore && yaw_rate_ignore) {
@ -1064,7 +1064,7 @@ void GCS_MAVLINK_Rover::handleMessage(mavlink_message_t* msg) @@ -1064,7 +1064,7 @@ void GCS_MAVLINK_Rover::handleMessage(mavlink_message_t* msg)
}
// set guided mode targets
if (!pos_ignore && vel_ignore && acc_ignore && yaw_ignore && yaw_rate_ignore) {
if (!pos_ignore) {
// consume position target
rover.mode_guided.set_desired_location(target_loc);
} else if (pos_ignore && !vel_ignore && acc_ignore && yaw_ignore && yaw_rate_ignore) {

Loading…
Cancel
Save