Browse Source

navigator: Feedback strings / text and logic was not consistent in previous state, fixed.

sbg
Lorenz Meier 11 years ago
parent
commit
101e7b1383
  1. 6
      src/modules/navigator/mission_feasibility_checker.cpp

6
src/modules/navigator/mission_feasibility_checker.cpp

@ -136,14 +136,14 @@ bool MissionFeasibilityChecker::checkHomePositionAltitude(dm_item_t dm_current,
} }
/* calculate the global waypoint altitude */ /* 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 (home_alt > wp_alt) {
if (throw_error) { 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; return false;
} else { } 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; return true;
} }
} }

Loading…
Cancel
Save