aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2013-12-29 14:50:49 +0100
committerJulian Oes <julian@oes.ch>2013-12-29 14:50:49 +0100
commitea9efd75dd688c42a16667d199be08bdb1aacddf (patch)
tree976420743adba924c1ff67c6acda22d46b0123ab
parentea55527bbb2a0a14b099e9c4d8c69faf7a623196 (diff)
downloadpx4-firmware-ea9efd75dd688c42a16667d199be08bdb1aacddf.tar.gz
px4-firmware-ea9efd75dd688c42a16667d199be08bdb1aacddf.tar.bz2
px4-firmware-ea9efd75dd688c42a16667d199be08bdb1aacddf.zip
Navigator: Small error message fix
-rw-r--r--src/modules/navigator/navigator_main.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp
index 37c2a0389..0a0ee2541 100644
--- a/src/modules/navigator/navigator_main.cpp
+++ b/src/modules/navigator/navigator_main.cpp
@@ -977,9 +977,8 @@ Navigator::start_mission()
mavlink_log_info(_mavlink_fd, "[navigator] heading to offboard WP %d", index);
}
} 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;
- warnx("ERROR: current WP can't be set");
}
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.radius - b.radius) < FLT_EPSILON &&
fabsf(a.time_inside - b.time_inside) < FLT_EPSILON &&
- fabsf(a.autocontinue - b.autocontinue) < FLT_EPSILON &&
- fabsf(a.index - b.index) < FLT_EPSILON) {
+ fabsf(a.autocontinue - b.autocontinue) < FLT_EPSILON) {
return true;
} else {
- warnx("a.index %d, b.index %d", a.index, b.index);
return false;
}
}