diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-07-12 13:23:31 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-07-12 13:23:31 +0400 |
| commit | 77add4b5113b2d8973f51f80df31bd3cfc83ba64 (patch) | |
| tree | fe59a2ccbea939fddc25aa29383d458323d83a68 | |
| parent | d4c6ebde338c8aa1b0d2c9574d3bbdeead525cea (diff) | |
| parent | 3b9c306d64acdebddbf9de1d518777f11c066cbe (diff) | |
| download | px4-firmware-77add4b5113b2d8973f51f80df31bd3cfc83ba64.tar.gz px4-firmware-77add4b5113b2d8973f51f80df31bd3cfc83ba64.tar.bz2 px4-firmware-77add4b5113b2d8973f51f80df31bd3cfc83ba64.zip | |
Merge branch 'master' into seatbelt_multirotor
| -rw-r--r-- | src/modules/mavlink/waypoints.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/mavlink/waypoints.c b/src/modules/mavlink/waypoints.c index 405046750..eea928a17 100644 --- a/src/modules/mavlink/waypoints.c +++ b/src/modules/mavlink/waypoints.c @@ -373,7 +373,7 @@ void check_waypoints_reached(uint64_t now, const struct vehicle_global_position_ dist = mavlink_wpm_distance_to_point_global_wgs84(wpm->current_active_wp_id, (float)global_pos->lat * 1e-7f, (float)global_pos->lon * 1e-7f, global_pos->alt); } else if (coordinate_frame == (int)MAV_FRAME_GLOBAL_RELATIVE_ALT) { - dist = mavlink_wpm_distance_to_point_global_wgs84(wpm->current_active_wp_id, global_pos->lat, global_pos->lon, global_pos->relative_alt); + dist = mavlink_wpm_distance_to_point_global_wgs84(wpm->current_active_wp_id, (float)global_pos->lat * 1e-7f, (float)global_pos->lon * 1e-7f, global_pos->relative_alt); } else if (coordinate_frame == (int)MAV_FRAME_LOCAL_ENU || coordinate_frame == (int)MAV_FRAME_LOCAL_NED) { dist = mavlink_wpm_distance_to_point_local(wpm->current_active_wp_id, local_pos->x, local_pos->y, local_pos->z); |