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

mission: handle precision landing inactivation properly

Browse Source
This commit is contained in:
Dusan Zivkovic
2020-05-29 09:11:01 +02:00
committed by Julian Oes
parent a758ea1220
commit 7eee9deb4c
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/mission.cpp
+11 -11
View File
@@ -143,6 +143,10 @@ Mission::on_inactivation()
cmd.param1 = -1.0f; cmd.param1 = -1.0f;
cmd.param3 = 1.0f; cmd.param3 = 1.0f;
_navigator->publish_vehicle_cmd(&cmd); _navigator->publish_vehicle_cmd(&cmd);
if (_navigator->get_precland()->is_activated()) {
_navigator->get_precland()->on_inactivation();
}
} }
void void
@@ -174,17 +178,6 @@ Mission::on_activation()
void void
Mission::on_active() Mission::on_active()
{ {
if (_work_item_type == WORK_ITEM_TYPE_PRECISION_LAND) {
// switch out of precision land once landed
if (_navigator->get_land_detected()->landed) {
_navigator->get_precland()->on_inactivation();
_work_item_type = WORK_ITEM_TYPE_DEFAULT;
} else {
_navigator->get_precland()->on_active();
}
}
check_mission_valid(false); check_mission_valid(false);
/* check if anything has changed */ /* check if anything has changed */
@@ -270,6 +263,13 @@ Mission::on_active()
do_abort_landing(); do_abort_landing();
} }
if (_work_item_type == WORK_ITEM_TYPE_PRECISION_LAND) {
_navigator->get_precland()->on_active();
} else if (_navigator->get_precland()->is_activated()) {
_navigator->get_precland()->on_inactivation();
}
} }
bool bool