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

geofence: fixed warnings

Browse Source
This commit is contained in:
Julian Oes
2014-06-06 17:17:06 +02:00
parent 034856a24c
commit 9bfae10b73
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/geofence.cpp
+5 -4
View File
@@ -78,7 +78,7 @@ bool Geofence::inside(const struct vehicle_global_position_s *vehicle)
{ {
double lat = vehicle->lat / 1e7d; double lat = vehicle->lat / 1e7d;
double lon = vehicle->lon / 1e7d; double lon = vehicle->lon / 1e7d;
float alt = vehicle->alt; //float alt = vehicle->alt;
return inside(lat, lon, vehicle->alt); return inside(lat, lon, vehicle->alt);
} }
@@ -116,9 +116,9 @@ bool Geofence::inside(double lat, double lon, float altitude)
} }
// skip vertex 0 (return point) // skip vertex 0 (return point)
if (((temp_vertex_i.lon) >= lon != (temp_vertex_j.lon >= lon)) && if (((double)temp_vertex_i.lon >= lon) != ((double)temp_vertex_j.lon >= lon) &&
(lat <= (temp_vertex_j.lat - temp_vertex_i.lat) * (lon - temp_vertex_i.lon) / (lat <= (double)(temp_vertex_j.lat - temp_vertex_i.lat) * (lon - (double)temp_vertex_i.lon) /
(temp_vertex_j.lon - temp_vertex_i.lon) + temp_vertex_i.lat)) { (double)(temp_vertex_j.lon - temp_vertex_i.lon) + (double)temp_vertex_i.lat)) {
c = !c; c = !c;
} }
@@ -294,4 +294,5 @@ Geofence::loadFromFile(const char *filename)
int Geofence::clearDm() int Geofence::clearDm()
{ {
dm_clear(DM_KEY_FENCE_POINTS); dm_clear(DM_KEY_FENCE_POINTS);
return OK;
} }