diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-12 11:11:26 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-12 11:11:26 +0200 |
| commit | 3b9c306d64acdebddbf9de1d518777f11c066cbe (patch) | |
| tree | 8067e6ce955e0c87c24a3c87cdd0b7cac6946e63 /src/modules/mavlink | |
| parent | f1e73df36c979b61d3eb6f3b5c83d05549ee071a (diff) | |
| download | px4-firmware-3b9c306d64acdebddbf9de1d518777f11c066cbe.tar.gz px4-firmware-3b9c306d64acdebddbf9de1d518777f11c066cbe.tar.bz2 px4-firmware-3b9c306d64acdebddbf9de1d518777f11c066cbe.zip | |
Hotfix for relative altitude waypoints
Diffstat (limited to 'src/modules/mavlink')
| -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); |