aboutsummaryrefslogtreecommitdiff
path: root/src/modules/uORB
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-01-02 14:52:00 +0400
committerAnton Babushkin <anton.babushkin@me.com>2014-01-02 14:52:00 +0400
commit5bedd8c714685b73eff67da1586c90c874d990ab (patch)
tree387b8ac2f0a326beab9d249347e9f9ad434b1f24 /src/modules/uORB
parent61ef2e00a96badcd2d30d91e4f14b479114ee7f1 (diff)
parent6a5d5f7136c8f317594bcc768131fe1779eabf2c (diff)
downloadpx4-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/uORB')
-rw-r--r--src/modules/uORB/topics/mission.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/uORB/topics/mission.h b/src/modules/uORB/topics/mission.h
index 95bceb8bb..194e2ed0c 100644
--- a/src/modules/uORB/topics/mission.h
+++ b/src/modules/uORB/topics/mission.h
@@ -87,7 +87,7 @@ struct mission_item_s
float loiter_radius; /**< loiter radius in meters, 0 for a VTOL to hover */
int8_t loiter_direction; /**< 1: positive / clockwise, -1, negative. */
enum NAV_CMD nav_cmd; /**< navigation command */
- float radius; /**< radius in which the mission is accepted as reached in meters */
+ float acceptance_radius; /**< default radius in which the mission is accepted as reached in meters */
float time_inside; /**< time that the MAV should stay inside the radius before advancing in seconds */
float pitch_min; /**< minimal pitch angle for fixed wing takeoff waypoints */
bool autocontinue; /**< true if next waypoint should follow after this one */