Merge pull request #1119 from PX4/navigator_rewrite_drton

Navigator rewrite - DrTon
This commit is contained in:
Lorenz Meier
2014-07-07 14:30:38 +02:00
14 changed files with 372 additions and 320 deletions

View File

@@ -1747,6 +1747,13 @@ set_main_state_rc(struct vehicle_status_s *status, struct manual_control_setpoin
}
print_reject_mode(status, "AUTO_MISSION");
// fallback to LOITER if home position not set
res = main_state_transition(status, MAIN_STATE_AUTO_LOITER);
if (res != TRANSITION_DENIED) {
break; // changed successfully or already in this state
}
}
// fallback to POSCTL