fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-04 15:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixing takeoff mission and swtiching to previous flight mode after land/takeoff

Browse Source
This commit is contained in:
Andreas Antener
2015-12-18 11:24:21 +01:00
committed by Lorenz Meier
parent 64349c7a09
commit f17c5d8d55
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/takeoff.cpp
+2 -1
View File
@@ -78,6 +78,7 @@ Takeoff::on_activation()
_navigator->get_mission_result()->reached = false;
_navigator->get_mission_result()->finished = false;
_navigator->set_mission_result_updated();
reset_mission_item_reached();
/* convert mission item to current setpoint */
struct position_setpoint_triplet_s *pos_sp_triplet = _navigator->get_position_setpoint_triplet();
@@ -96,7 +97,7 @@ Takeoff::on_activation()
void
Takeoff::on_active()
{
if (is_mission_item_reached()) {
if (is_mission_item_reached() && !_navigator->get_mission_result()->finished) {
_navigator->get_mission_result()->finished = true;
_navigator->set_mission_result_updated();
}