Browse Source

Plane: move set_mode() after mission.set_current_cmd()

if set_current_cmd() fails, we don't want to change to AUTO with some
unknown mission item
mission-4.1.18
Andrew Tridgell 10 years ago
parent
commit
e434850f1f
  1. 5
      ArduPlane/landing.pde

5
ArduPlane/landing.pde

@ -125,10 +125,9 @@ static bool jump_to_landing_sequence(void)
{ {
uint16_t land_idx = mission.get_landing_sequence_start(); uint16_t land_idx = mission.get_landing_sequence_start();
if (land_idx != 0) { if (land_idx != 0) {
set_mode(AUTO);
if (mission.set_current_cmd(land_idx)) { if (mission.set_current_cmd(land_idx)) {
set_mode(AUTO);
//if the mission has ended it has to be restarted //if the mission has ended it has to be restarted
if (mission.state() == AP_Mission::MISSION_STOPPED) { if (mission.state() == AP_Mission::MISSION_STOPPED) {
mission.resume(); mission.resume();

Loading…
Cancel
Save