diff options
author | Julian Oes <julian@oes.ch> | 2014-06-06 17:17:06 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2014-06-06 17:17:06 +0200 |
commit | 9bfae10b73406ca4f6600a0441c6edf5077f1446 (patch) | |
tree | f8670775de8a0969af8427de04483f2711c6bbbc /src/modules/navigator/geofence.cpp | |
parent | 034856a24c4ffd41c991797e75517ed456f77a54 (diff) | |
download | px4-firmware-9bfae10b73406ca4f6600a0441c6edf5077f1446.tar.gz px4-firmware-9bfae10b73406ca4f6600a0441c6edf5077f1446.tar.bz2 px4-firmware-9bfae10b73406ca4f6600a0441c6edf5077f1446.zip |
geofence: fixed warnings
Diffstat (limited to 'src/modules/navigator/geofence.cpp')
-rw-r--r-- | src/modules/navigator/geofence.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/navigator/geofence.cpp b/src/modules/navigator/geofence.cpp index bc8dbca50..266215308 100644 --- a/src/modules/navigator/geofence.cpp +++ b/src/modules/navigator/geofence.cpp @@ -78,7 +78,7 @@ bool Geofence::inside(const struct vehicle_global_position_s *vehicle) { double lat = vehicle->lat / 1e7d; double lon = vehicle->lon / 1e7d; - float alt = vehicle->alt; + //float alt = 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) - if (((temp_vertex_i.lon) >= lon != (temp_vertex_j.lon >= lon)) && - (lat <= (temp_vertex_j.lat - temp_vertex_i.lat) * (lon - temp_vertex_i.lon) / - (temp_vertex_j.lon - temp_vertex_i.lon) + temp_vertex_i.lat)) { + if (((double)temp_vertex_i.lon >= lon) != ((double)temp_vertex_j.lon >= lon) && + (lat <= (double)(temp_vertex_j.lat - temp_vertex_i.lat) * (lon - (double)temp_vertex_i.lon) / + (double)(temp_vertex_j.lon - temp_vertex_i.lon) + (double)temp_vertex_i.lat)) { c = !c; } @@ -294,4 +294,5 @@ Geofence::loadFromFile(const char *filename) int Geofence::clearDm() { dm_clear(DM_KEY_FENCE_POINTS); + return OK; } |