diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-02 14:52:00 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-02 14:52:00 +0400 |
| commit | 5bedd8c714685b73eff67da1586c90c874d990ab (patch) | |
| tree | 387b8ac2f0a326beab9d249347e9f9ad434b1f24 /src/modules/mavlink | |
| parent | 61ef2e00a96badcd2d30d91e4f14b479114ee7f1 (diff) | |
| parent | 6a5d5f7136c8f317594bcc768131fe1779eabf2c (diff) | |
| download | px4-firmware-5bedd8c714685b73eff67da1586c90c874d990ab.tar.gz px4-firmware-5bedd8c714685b73eff67da1586c90c874d990ab.tar.bz2 px4-firmware-5bedd8c714685b73eff67da1586c90c874d990ab.zip | |
Merge branch 'navigator_new' into navigator_new_vector
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/waypoints.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/waypoints.c b/src/modules/mavlink/waypoints.c index 2ff11e813..1adfeafde 100644 --- a/src/modules/mavlink/waypoints.c +++ b/src/modules/mavlink/waypoints.c @@ -143,7 +143,7 @@ int map_mavlink_mission_item_to_mission_item(const mavlink_mission_item_t *mavli mission_item->pitch_min = mavlink_mission_item->param2; break; default: - mission_item->radius = mavlink_mission_item->param2; + mission_item->acceptance_radius = mavlink_mission_item->param2; break; } @@ -173,7 +173,7 @@ int map_mission_item_to_mavlink_mission_item(const struct mission_item_s *missio mavlink_mission_item->param2 = mission_item->pitch_min; break; default: - mavlink_mission_item->param2 = mission_item->radius; + mavlink_mission_item->param2 = mission_item->acceptance_radius; break; } |