Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 03:36:48 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Navigator: Fix mission feedback and wording

Browse Source
This commit is contained in:
Lorenz Meier
2016-08-06 10:34:20 +02:00
parent 278b607f62
commit bcd5f98cb1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/mission.cpp
+4 -4
View File
@@ -372,7 +372,7 @@ Mission::set_mission_items()
if (_param_onboard_enabled.get() && prepare_mission_items(true, &_mission_item, &mission_item_next_position, &has_next_position_item)) { if (_param_onboard_enabled.get() && prepare_mission_items(true, &_mission_item, &mission_item_next_position, &has_next_position_item)) {
/* if mission type changed, notify */ /* if mission type changed, notify */
if (_mission_type != MISSION_TYPE_ONBOARD) { if (_mission_type != MISSION_TYPE_ONBOARD) {
mavlink_log_critical(_navigator->get_mavlink_log_pub(), "onboard mission now running"); mavlink_log_info(_navigator->get_mavlink_log_pub(), "Executing internal mission");
user_feedback_done = true; user_feedback_done = true;
} }
_mission_type = MISSION_TYPE_ONBOARD; _mission_type = MISSION_TYPE_ONBOARD;
@@ -381,7 +381,7 @@ Mission::set_mission_items()
} else if (prepare_mission_items(false, &_mission_item, &mission_item_next_position, &has_next_position_item)) { } else if (prepare_mission_items(false, &_mission_item, &mission_item_next_position, &has_next_position_item)) {
/* if mission type changed, notify */ /* if mission type changed, notify */
if (_mission_type != MISSION_TYPE_OFFBOARD) { if (_mission_type != MISSION_TYPE_OFFBOARD) {
mavlink_log_info(_navigator->get_mavlink_log_pub(), "offboard mission now running"); mavlink_log_info(_navigator->get_mavlink_log_pub(), "Executing mission");
user_feedback_done = true; user_feedback_done = true;
} }
_mission_type = MISSION_TYPE_OFFBOARD; _mission_type = MISSION_TYPE_OFFBOARD;
@@ -390,10 +390,10 @@ Mission::set_mission_items()
if (_mission_type != MISSION_TYPE_NONE) { if (_mission_type != MISSION_TYPE_NONE) {
if (_navigator->get_land_detected()->landed) { if (_navigator->get_land_detected()->landed) {
mavlink_log_critical(_navigator->get_mavlink_log_pub(), "mission finished, landed"); mavlink_log_info(_navigator->get_mavlink_log_pub(), "mission finished, landed");
} else { } else {
/* https://en.wikipedia.org/wiki/Loiter_(aeronautics) */ /* https://en.wikipedia.org/wiki/Loiter_(aeronautics) */
mavlink_log_critical(_navigator->get_mavlink_log_pub(), "mission finished, loitering"); mavlink_log_info(_navigator->get_mavlink_log_pub(), "mission finished, loitering");
/* use last setpoint for loiter */ /* use last setpoint for loiter */
_navigator->set_can_loiter_at_sp(true); _navigator->set_can_loiter_at_sp(true);