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

Navigator: Small error message fix

Browse Source
This commit is contained in:
Julian Oes
2013-12-29 14:50:49 +01:00
parent ea55527bbb
commit ea9efd75dd
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/navigator_main.cpp
+2 -5
View File
@@ -977,9 +977,8 @@ Navigator::start_mission()
mavlink_log_info(_mavlink_fd, "[navigator] heading to offboard WP %d", index); mavlink_log_info(_mavlink_fd, "[navigator] heading to offboard WP %d", index);
} }
} else { } else {
/* since a mission is not started without WPs available, this is not supposed to happen */ /* since a mission is started without knowledge if there are more mission items available, this can fail */
_mission_item_triplet.current_valid = false; _mission_item_triplet.current_valid = false;
warnx("ERROR: current WP can't be set");
} }
ret = _mission.get_next_mission_item(&_mission_item_triplet.next); ret = _mission.get_next_mission_item(&_mission_item_triplet.next);
@@ -1308,11 +1307,9 @@ bool Navigator::cmp_mission_item_equivalent(const struct mission_item_s a, const
fabsf(a.nav_cmd - b.nav_cmd) < FLT_EPSILON && fabsf(a.nav_cmd - b.nav_cmd) < FLT_EPSILON &&
fabsf(a.radius - b.radius) < FLT_EPSILON && fabsf(a.radius - b.radius) < FLT_EPSILON &&
fabsf(a.time_inside - b.time_inside) < FLT_EPSILON && fabsf(a.time_inside - b.time_inside) < FLT_EPSILON &&
fabsf(a.autocontinue - b.autocontinue) < FLT_EPSILON && fabsf(a.autocontinue - b.autocontinue) < FLT_EPSILON) {
fabsf(a.index - b.index) < FLT_EPSILON) {
return true; return true;
} else { } else {
warnx("a.index %d, b.index %d", a.index, b.index);
return false; return false;
} }
} }