fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 15:53: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/geofence.cpp
+3 -3
View File
@@ -146,13 +146,13 @@ bool Geofence::inside(double lat, double lon, float altitude)
&dist_xy, &dist_z);
if (max_vertical_distance > 0 && (dist_z > max_vertical_distance)) {
mavlink_log_critical(_mavlinkFd, "#audio: Geofence exceeded max vertical distance by %.0f m",
mavlink_log_critical(_mavlinkFd, "Geofence exceeded max vertical distance by %.0f m",
(double)(dist_z - max_vertical_distance));
return false;
}
if (max_horizontal_distance > 0 && (dist_xy > max_horizontal_distance)) {
mavlink_log_critical(_mavlinkFd, "#audio: Geofence exceeded max horizontal distance by %.0f m",
mavlink_log_critical(_mavlinkFd, "Geofence exceeded max horizontal distance by %.0f m",
(double)(dist_xy - max_horizontal_distance));
return false;
}
@@ -409,7 +409,7 @@ Geofence::loadFromFile(const char *filename)
} else {
warnx("Geofence: import error");
mavlink_log_critical(_mavlinkFd, "#audio: Geofence import error");
mavlink_log_critical(_mavlinkFd, "Geofence import error");
}
error: