Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rover: fix to support uploading partial missions

This commit is contained in:
Randy Mackay 2014-03-17 16:07:18 +09:00
parent 30194b9e72
commit df5c874f73
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
APMrover2/GCS_Mavlink.pde
View File

@ -1444,12 +1444,8 @@ mission_item_send_failed:
break; break;
} }
// new mission arriving, clear current mission // new mission arriving, truncate mission to be the same length
if (!mission.clear()) { mission.truncate(packet.count);
// return error if we were unable to clear the mission (possibly because we're currently flying the mission)
mavlink_msg_mission_ack_send(chan, msg->sysid, msg->compid, MAV_MISSION_ERROR);
break;
}
waypoint_timelast_receive = millis(); waypoint_timelast_receive = millis();
waypoint_timelast_request = 0; waypoint_timelast_request = 0;