diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-31 15:44:45 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-31 15:44:45 +0100 |
| commit | 939fc83c4ad0bf299db35b7ec0c44dee47f3d033 (patch) | |
| tree | 55bdacaf227828434b7c6ac3a25fd2fd2df65f2c /apps/systemlib/geo/geo.c | |
| parent | 472010b10b50436d8c40d94a7d9a888c1fe06858 (diff) | |
| download | px4-firmware-939fc83c4ad0bf299db35b7ec0c44dee47f3d033.tar.gz px4-firmware-939fc83c4ad0bf299db35b7ec0c44dee47f3d033.tar.bz2 px4-firmware-939fc83c4ad0bf299db35b7ec0c44dee47f3d033.zip | |
Fix compile warnings
Diffstat (limited to 'apps/systemlib/geo/geo.c')
| -rw-r--r-- | apps/systemlib/geo/geo.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/systemlib/geo/geo.c b/apps/systemlib/geo/geo.c index 789368fbd..3709feb15 100644 --- a/apps/systemlib/geo/geo.c +++ b/apps/systemlib/geo/geo.c @@ -49,19 +49,19 @@ __EXPORT float get_distance_to_next_waypoint(double lat_now, double lon_now, double lat_next, double lon_next) { - double lat_now_rad = lat_now / 180.0 * M_PI; - double lon_now_rad = lon_now / 180.0 * M_PI; - double lat_next_rad = lat_next / 180.0 * M_PI; - double lon_next_rad = lon_next / 180.0 * M_PI; + double lat_now_rad = lat_now / 180.0d * M_PI; + double lon_now_rad = lon_now / 180.0d * M_PI; + double lat_next_rad = lat_next / 180.0d * M_PI; + double lon_next_rad = lon_next / 180.0d * M_PI; double d_lat = lat_next_rad - lat_now_rad; double d_lon = lon_next_rad - lon_now_rad; - double a = sin(d_lat / 2.0) * sin(d_lat / 2.0) + sin(d_lon / 2.0) * sin(d_lon / 2.0) * cos(lat_now_rad) * cos(lat_next_rad); - double c = 2 * atan2(sqrt(a), sqrt(1 - a)); + double a = sin(d_lat / 2.0d) * sin(d_lat / 2.0) + sin(d_lon / 2.0d) * sin(d_lon / 2.0d) * cos(lat_now_rad) * cos(lat_next_rad); + double c = 2.0d * atan2(sqrt(a), sqrt(1.0d - a)); - const double radius_earth = 6371000.0; + const double radius_earth = 6371000.0d; return radius_earth * c; } |