diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-17 21:06:42 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-17 21:06:42 +0200 |
| commit | 101e7b1383b83c9b06ef147dbef1ff375c11b84f (patch) | |
| tree | 83771d5623a0001c767ebc7a988fa652957cc615 /src/modules/navigator | |
| parent | c01567c047f295e3ffea7d01a7e239ac4f79a498 (diff) | |
| download | px4-firmware-101e7b1383b83c9b06ef147dbef1ff375c11b84f.tar.gz px4-firmware-101e7b1383b83c9b06ef147dbef1ff375c11b84f.tar.bz2 px4-firmware-101e7b1383b83c9b06ef147dbef1ff375c11b84f.zip | |
navigator: Feedback strings / text and logic was not consistent in previous state, fixed.
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/mission_feasibility_checker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/navigator/mission_feasibility_checker.cpp b/src/modules/navigator/mission_feasibility_checker.cpp index d45488d5a..606521f20 100644 --- a/src/modules/navigator/mission_feasibility_checker.cpp +++ b/src/modules/navigator/mission_feasibility_checker.cpp @@ -136,14 +136,14 @@ bool MissionFeasibilityChecker::checkHomePositionAltitude(dm_item_t dm_current, } /* calculate the global waypoint altitude */ - float wp_alt = (missionitem.altitude_is_relative) ? missionitem.altitude + home_alt ? missionitem.altitude; + float wp_alt = (missionitem.altitude_is_relative) ? missionitem.altitude + home_alt : missionitem.altitude; if (home_alt > wp_alt) { if (throw_error) { - mavlink_log_critical(_mavlink_fd, "Warning: Waypoint %d below home", i); + mavlink_log_critical(_mavlink_fd, "Rejecting Mission: Waypoint %d below home", i); return false; } else { - mavlink_log_critical(_mavlink_fd, "Rejecting Mission: Waypoint %d below home", i); + mavlink_log_critical(_mavlink_fd, "Warning: Waypoint %d below home", i); return true; } } |