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

navigator: Get rid of audio tag in strings and use appropriate priority to get audio out when needed in the GCS

Browse Source
This commit is contained in:
Lorenz Meier
2015-04-14 13:25:49 +02:00
parent eda19ee5a1
commit 4b34221614
9 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/mission_feasibility_checker.cpp
+6 -6
View File
@@ -121,7 +121,7 @@ bool MissionFeasibilityChecker::checkGeofence(dm_item_t dm_current, size_t nMiss
}
if (!geofence.inside_polygon(missionitem.lat, missionitem.lon, missionitem.altitude)) {
mavlink_log_info(_mavlink_fd, "#audio: Geofence violation waypoint %d", i);
mavlink_log_critical(_mavlink_fd, "Geofence violation waypoint %d", i);
return false;
}
}
@@ -203,25 +203,25 @@ bool MissionFeasibilityChecker::checkFixedWingLanding(dm_item_t dm_current, size
return true;
} else {
/* Landing waypoint is above altitude of slope at the given waypoint distance */
mavlink_log_info(_mavlink_fd, "#audio: Landing: last waypoint too high/too close");
mavlink_log_info(_mavlink_fd, "Move down to %.1fm or move further away by %.1fm",
mavlink_log_critical(_mavlink_fd, "Landing: last waypoint too high/too close");
mavlink_log_critical(_mavlink_fd, "Move down to %.1fm or move further away by %.1fm",
(double)(slope_alt_req),
(double)(wp_distance_req - wp_distance));
return false;
}
} else {
/* Landing waypoint is above last waypoint */
mavlink_log_info(_mavlink_fd, "#audio: Landing waypoint above last nav waypoint");
mavlink_log_critical(_mavlink_fd, "Landing waypoint above last nav waypoint");
return false;
}
} else {
/* Last wp is in flare region */
//xxx give recommendations
mavlink_log_info(_mavlink_fd, "#audio: Warning: Landing: last waypoint in flare region");
mavlink_log_critical(_mavlink_fd, "Warning: Landing: last waypoint in flare region");
return false;
}
} else {
mavlink_log_info(_mavlink_fd, "#audio: Warning: starting with land waypoint");
mavlink_log_critical(_mavlink_fd, "Warning: starting with land waypoint");
return false;
}
}