dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

navigator: Fixed bitwise or

This commit is contained in:
Lorenz Meier 2015-06-15 21:55:02 +02:00
parent 41f535ae26
commit 677aef6673
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/navigator/mission_feasibility_checker.cpp
View File

@ -84,18 +84,18 @@ bool MissionFeasibilityChecker::checkMissionFeasible(int mavlink_fd, bool isRota
warned = true; warned = true;
mavlink_log_info(_mavlink_fd, "Not yet ready for mission, no position lock."); mavlink_log_info(_mavlink_fd, "Not yet ready for mission, no position lock.");
} else { } else {
failed |= !check_dist_1wp(dm_current, nMissionItems, curr_lat, curr_lon, max_waypoint_distance, warning_issued); failed = failed || !check_dist_1wp(dm_current, nMissionItems, curr_lat, curr_lon, max_waypoint_distance, warning_issued);
} }
// check if all mission item commands are supported // check if all mission item commands are supported
failed |= !checkMissionItemValidity(dm_current, nMissionItems); failed = failed || !checkMissionItemValidity(dm_current, nMissionItems);
failed |= !checkGeofence(dm_current, nMissionItems, geofence); failed = failed || !checkGeofence(dm_current, nMissionItems, geofence);
failed |= !checkHomePositionAltitude(dm_current, nMissionItems, home_alt, home_valid, warned); failed = failed || !checkHomePositionAltitude(dm_current, nMissionItems, home_alt, home_valid, warned);
if (isRotarywing) { if (isRotarywing) {
failed |= !checkMissionFeasibleRotarywing(dm_current, nMissionItems, geofence, home_alt, home_valid); failed = failed || !checkMissionFeasibleRotarywing(dm_current, nMissionItems, geofence, home_alt, home_valid);
} else { } else {
failed |= !checkMissionFeasibleFixedwing(dm_current, nMissionItems, geofence, home_alt, home_valid); failed = failed || !checkMissionFeasibleFixedwing(dm_current, nMissionItems, geofence, home_alt, home_valid);
} }
if (!failed) { if (!failed) {