Skip to content

Commit ffef978

Browse files
committed
4.7:32147/WPNAV param rename
1 parent aceffab commit ffef978

19 files changed

+52
-52
lines changed

common/source/docs/common-oa-dijkstras.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Configuration
2424

2525
- :ref:`OA_TYPE <OA_TYPE>` = 2 (Dijkstra). You may need to refresh parameters after changing this to see the parameters below.
2626
- :ref:`OA_MARGIN_MAX <OA_MARGIN_MAX>`: the distance (in meters) that the vehicle should stay away from the fences and stay-out zones
27-
- :ref:`OA_OPTIONS<OA_OPTIONS>` bit 2 (+4 to the value) can be set to use S-Curves around fence corners in the planned path to speed up turns. Note that using S-Curves, instead of the normal "approach,stop, turn, proceed" method of path planning around sharp fence corners, could still result in a fence breach.To avoid this ``WPNAV_RADIUS`` should be set smaller than :ref:`FENCE_MARGIN<FENCE_MARGIN>`. Also waypoints should also be placed at least 10m from fence boundaries.
27+
- :ref:`OA_OPTIONS<OA_OPTIONS>` bit 2 (+4 to the value) can be set to use S-Curves around fence corners in the planned path to speed up turns. Note that using S-Curves, instead of the normal "approach,stop, turn, proceed" method of path planning around sharp fence corners, could still result in a fence breach.To avoid this :ref:`WP_RADIUS_M<WP_RADIUS_M>` should be set smaller than :ref:`FENCE_MARGIN<FENCE_MARGIN>`. Also waypoints should also be placed at least 10m from fence boundaries.
2828
[site wiki="copter"]
2929
- For use in :ref:`Guided mode <ac2_guidedmode>`, set :ref:`GUID_OPTIONS<GUID_OPTIONS>` bit 6 (e.g. 64)
3030
[/site]

common/source/docs/common-transmitter-tuning.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ The :ref:`TUNE_MAX<TUNE_MAX>` parameter determines the maximum value of the para
340340
+--------+-------------------------+----------------------------------------------------------------------+
341341
|28 |Velocity XY kI | ``PSC_VELXY_I`` |
342342
+--------+-------------------------+----------------------------------------------------------------------+
343-
|10 |WP Speed | ``WPNAV_SPEED`` |
343+
|10 |WP Speed | :ref:`WP_SPD<WP_SPD>` |
344344
+--------+-------------------------+----------------------------------------------------------------------+
345345
|25 |Acro RollPitch kP | :ref:`ACRO_RP_RATE<ACRO_RP_RATE>` |
346346
+--------+-------------------------+----------------------------------------------------------------------+

copter/source/docs/ac2_guidedmode.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ Speed Control
7171
=============
7272

7373
The maximum horizontal speed of the copter can be adjusted with the
74-
**Speed** (``WPNAV_SPEED``) parameter from the Mission Planner's
74+
**Speed** (:ref:`WP_SPD<WP_SPD>`) parameter from the Mission Planner's
7575
Config/Tuning >> Copter Pids screen (see blue box above). The default
7676
is 1000 meaning 10m/s. A typical copter can reach top speeds of 10m/s ~
7777
13m/s (i.e. 1000 ~ 1300) before it becomes unable to both maintain
7878
altitude and horizontal speed.
7979

80-
The vertical speeds up and down can similar be adjusted with the **Speed Up** (``WPNAV_SPEED_UP``) and **Speed Dn** (``WPNAV_SPEED_DN``) parameters. ``WPNAV_ACCEL_Z`` determines how fast the speed can change.
80+
The vertical speeds up and down can similar be adjusted with the **Speed Up** (:ref:`WP_SPD_UP<WP_SPD_UP>`) and **Speed Dn** (:ref:`WP_SPD_DN<WP_SPD_DN>`) parameters. :ref:`WP_ACC_Z<WP_ACC_Z>` determines how fast the speed can change.
8181

8282
Speed can also be controlled while in GUIDED mode with :ref:`MAVLink commands <common-mavlink-mission-command-messages-mav_cmd>` like :ref:`DO_CHANGE_SPEED<mav_cmd_do_change_speed>`.
8383

copter/source/docs/auto-mode.rst

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ Overview
2727
.. image:: ../images/auto.jpg
2828
:target: ../_images/auto.jpg
2929

30-
AUTO mode navigates between each waypoint in a straight line and as it approaches each waypoint follows a smooth curving path towards the next waypoint (S-Curve). It controls the path as it approaches a waypoint to be within the ``WPNAV_RADIUS`` of each waypoint. The speed is lowered below ``WPNAV_SPEED``, as necessary, to keep the vehicle within the configured acceleration limits (``WPNAV_ACCEL`` and ``WPNAV_ACCEL_C``).
30+
AUTO mode navigates between each waypoint in a straight line and as it approaches each waypoint follows a smooth curving path towards the next waypoint (S-Curve). It controls the path as it approaches a waypoint to be within the :ref:`WP_RADIUS_M<WP_RADIUS_M>` of each waypoint. The speed is lowered below :ref:`WP_SPD<WP_SPD>`, as necessary, to keep the vehicle within the configured acceleration limits (:ref:`WP_ACC<WP_ACC>` and :ref:`WP_ACC_CNR<WP_ACC_CNR>`).
3131

3232
This smooth curving path as it changes direction to the next waypoint will not occur if the next mission command after the waypoint is anything other than a normal waypoint (e.g LAND, LOITER_TURNS, RTL, etc). In these cases the copter will approach the waypoint, stop, and then proceed to the next navigation waypoint instead of smoothly curving in front of it and proceeding to that next navigation waypoint.
3333

34-
Also, small ``WPNAV_RADIUS`` values will require that the curve be very small, effectively appearing like the non-S-Curve behavior explained above.
34+
Also, small :ref:`WP_RADIUS_M<WP_RADIUS_M>` values will require that the curve be very small, effectively appearing like the non-S-Curve behavior explained above.
3535

3636
Starting a Mission
3737
==================
@@ -92,17 +92,17 @@ AUTO mode incorporates the altitude control from :ref:`AltHold mode <altholdmode
9292

9393
Commonly adjusted settings are listed below. Most of these can be adjusted from the Mission Planner's Config, Extended Tuning screen (see above).
9494

95-
- ``WPNAV_SPEED`` is the maximum horizontal speed (in cm/s) during missions. The default is 1000 which is 10m/s. A typical copter can reach top speeds of 10m/s ~ 20m/s (e.g. 1000 ~ 2000) before it becomes unable to maintain both altitude and horizontal speed
96-
- ``WPNAV_ACCEL`` determines how quickly the horizontal speed can change (in cm/s/s). Lower values result in smoother acceleration and deceleration and may also cause the vehicle to cut the corners more. Higher values will lead to more aggressive movements and tighter cornering
97-
- ``WPNAV_SPEED_UP`` determines the max speed up in cm/s. Low values may lead to the vehicle's horizontal speed slowing during diagonal climbing waypoint segments
98-
- ``WPNAV_SPEED_DN`` determines the max speed down in cm/s. Low values may lead to the vehicle's horizontal speed slowing during diagonal descending waypoint segments. High values (above 150) may lead to unstable vertical descents as the vehicle passes through its own prop wash
99-
- ``WPNAV_RADIUS`` allows you to control how close the copter must come to the waypoint before it is considered "complete" and the copter moves onto the next waypoint. Setting this to a larger value may cause the vehicle to cut the corners more leading to a smoother path
95+
- :ref:`WP_SPD<WP_SPD>` is the maximum horizontal speed (in cm/s) during missions. The default is 1000 which is 10m/s. A typical copter can reach top speeds of 10m/s ~ 20m/s (e.g. 1000 ~ 2000) before it becomes unable to maintain both altitude and horizontal speed
96+
- :ref:`WP_ACC<WP_ACC>` determines how quickly the horizontal speed can change (in cm/s/s). Lower values result in smoother acceleration and deceleration and may also cause the vehicle to cut the corners more. Higher values will lead to more aggressive movements and tighter cornering
97+
- :ref:`WP_SPD_UP<WP_SPD_UP>` determines the max speed up in cm/s. Low values may lead to the vehicle's horizontal speed slowing during diagonal climbing waypoint segments
98+
- :ref:`WP_SPD_DN<WP_SPD_DN>` determines the max speed down in cm/s. Low values may lead to the vehicle's horizontal speed slowing during diagonal descending waypoint segments. High values (above 150) may lead to unstable vertical descents as the vehicle passes through its own prop wash
99+
- :ref:`WP_RADIUS_M<WP_RADIUS_M>` allows you to control how close the copter must come to the waypoint before it is considered "complete" and the copter moves onto the next waypoint. Setting this to a larger value may cause the vehicle to cut the corners more leading to a smoother path
100100

101101
Less commonly adjusted parameters include:
102102

103-
- ``WPNAV_ACCEL_C`` determines the maximum cornering acceleration in cm/s/s. Higher values will cause the vehicle to make sharper corners meaning it will cut the corners less
104-
- ``WPNAV_ACCEL_Z`` determines how quickly the vertical speed can change
105-
- ``WPNAV_JERK`` determines how quickly the horizontal acceleration can change (in m/s/s/s). Lower values will lead to a smoother acceleration and deceleration but will also lead to the mission taking slightly longer to complete
103+
- :ref:`WP_ACC_CNR<WP_ACC_CNR>` determines the maximum cornering acceleration in cm/s/s. Higher values will cause the vehicle to make sharper corners meaning it will cut the corners less
104+
- :ref:`WP_ACC_Z<WP_ACC_Z>` determines how quickly the vertical speed can change
105+
- :ref:`WP_JERK<WP_JERK>` determines how quickly the horizontal acceleration can change (in m/s/s/s). Lower values will lead to a smoother acceleration and deceleration but will also lead to the mission taking slightly longer to complete
106106

107107
Common Problems
108108
===============
@@ -111,18 +111,18 @@ Below are a list of commonly reported problems and recommendations
111111

112112
1. The vehicle does not cut the corners as much as I would like and/or stops at each waypoint
113113

114-
- Increase ``WPNAV_RADIUS`` to allow the vehicle to pass further from each waypoint
115-
- Increase ``WPNAV_SPEED`` to cause the vehicle to start turning earlier in order that it not surpass the max acceleration
116-
- Decrease ``WPNAV_ACCEL`` to cause the vehicle to start turning earlier and more gradually
117-
- Decrease ``WPNAV_ACCEL_C`` or reset to the default of zero
114+
- Increase :ref:`WP_RADIUS_M<WP_RADIUS_M>` to allow the vehicle to pass further from each waypoint
115+
- Increase :ref:`WP_SPD<WP_SPD>` to cause the vehicle to start turning earlier in order that it not surpass the max acceleration
116+
- Decrease :ref:`WP_ACC<WP_ACC>` to cause the vehicle to start turning earlier and more gradually
117+
- Decrease :ref:`WP_ACC_CNR<WP_ACC_CNR>` or reset to the default of zero
118118
- Ensure the waypoint command's Delay field is 0. A delay of even 1 second will cause the vehicle to stop at the waypoint
119119
- If :ref:`Dijkstras object avoidance <common-oa-dijkstras>` is enabled, by default the vehicle will stop at each waypoint. This can be avoided by setting the :ref:`OA_OPTIONS <OA_OPTIONS>` parameter
120120

121-
2. The vehicle does not reach the configured maximum horizontal speed (e.g. ``WPNAV_SPEED``)
121+
2. The vehicle does not reach the configured maximum horizontal speed (e.g. :ref:`WP_SPD<WP_SPD>`)
122122

123-
- Increase ``WPNAV_ACCEL`` to allow the vehicle to accelerate to its maximum speed more quickly
124-
- Increase ``WPNAV_JERK`` to allow the vehicle to get to its maximum acceleration more quickly
125-
- If the waypoint includes a climb or descent the vehicle's horizontal speed may be limited by ``WPNAV_SPEED_UP`` or ``WPNAV_SPEED_DN``
123+
- Increase :ref:`WP_ACC<WP_ACC>` to allow the vehicle to accelerate to its maximum speed more quickly
124+
- Increase :ref:`WP_JERK<WP_JERK>` to allow the vehicle to get to its maximum acceleration more quickly
125+
- If the waypoint includes a climb or descent the vehicle's horizontal speed may be limited by :ref:`WP_SPD_UP<WP_SPD_UP>` or :ref:`WP_SPD_DN<WP_SPD_DN>`
126126
- Ensure the vehicle's maximum lean angle (e.g. ``ANGLE_MAX``) is sufficient to reach the desired speed
127127
- Ensure the vehicle has enough power to maintain both altitude and the desired speed
128128
- If the mission command uses :ref:`terrain following <terrain-following>` the vehicle may need to slow horizontally to maintain the desired altitude above terrain

copter/source/docs/circle-mode.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The speed of the vehicle (in deg/second) can be modified by changing the
1818
:ref:`CIRCLE_RATE<CIRCLE_RATE>` parameter. A positive value means rotate clockwise, a
1919
negative means counter clockwise. The vehicle may not achieve the
2020
desired rate if this requires the acceleration towards the center of the
21-
circle to surpass the maximum acceleration held in the ``WPNAV_ACCEL``
21+
circle to surpass the maximum acceleration held in the :ref:`WP_ACC<WP_ACC>`
2222
parameter (units are cm/s/s).
2323

2424
The circle rate set above can be dynamically adjusted in flight by two methods. The first is the use of RC Channel 6 if the :ref:`TUNE<TUNE>` option is set to 39, allowing decreasing the rate 50% or increasing it by 100%, at the channel min and max. The other is by enabling the ``CIRCLE_CONTROL`` parameter to allow stick adjustment of radius and speed.

copter/source/docs/follow-mode.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ The following parameters can be used to tune Follow Mode's performance:
1919
- :ref:`FOLL_OFS_X <FOLL_OFS_X>`, :ref:`FOLL_OFS_Y <FOLL_OFS_Y>`, :ref:`FOLL_OFS_Z <FOLL_OFS_Z>`: 3D offset (in meters) from the lead vehicle
2020
- :ref:`FOLL_OFS_TYPE <FOLL_OFS_TYPE>`: set to 0 if offsets are North-East-Down, 1 if offsets are relative to lead vehicle's heading
2121
- :ref:`FOLL_YAW_BEHAVE <FOLL_YAW_BEHAVE>`: controls whether follow points in the same direction as lead vehicle or always towards it
22-
- :ref:`FOLL_POS_P <FOLL_POS_P>`: gain which controls how aggressively this vehicle moves towards lead vehicle (limited by ``WPNAV_SPEED``)
22+
- :ref:`FOLL_POS_P <FOLL_POS_P>`: gain which controls how aggressively this vehicle moves towards lead vehicle (limited by :ref:`WP_SPD<WP_SPD>`)
2323
- :ref:`FOLL_ALT_TYPE <FOLL_ALT_TYPE>`: allows selecting whether to use lead vehicle's relative-to-home or relative-to-sea-level altitude
2424
- :ref:`FOLL_OPTIONS<FOLL_OPTIONS>`: set bit 0 to "1" to enable the :ref:`common-mount-targeting` to follow the target vehicle.

copter/source/docs/land-mode.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Land Mode
77
LAND Mode attempts to bring the copter straight down and has these
88
features:
99

10-
- descends at ``LAND_SPEED_HIGH``, if non-zero, (or ``WPNAV_SPEED_DN`` if zero) using the regular Altitude Hold controller.
10+
- descends at ``LAND_SPEED_HIGH``, if non-zero, (or :ref:`WP_SPD_DN<WP_SPD_DN>` if zero) using the regular Altitude Hold controller.
1111
- the pilot can reposition the vehicle using the pitch and roll sticks. The throttle stick has no effect.
1212
- if a rangefinder is being used, or :ref:`TERRAIN_ENABLE<TERRAIN_ENABLE>` =1 and terrain data is available, the descent speed will then switch to ``LAND_SPEED`` at ``LAND_ALT_LOW`` altitude (default is 10m) above ground until landing occurs. If neither terrain data or rangefinder data is available, then altitude above HOME will be used for the speed switch point (if reached).
1313

copter/source/docs/mission-command-list.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ before proceeding to the next command
4545

4646
**Hit Rad** - not supported - meant to hold the distance (in meters)
4747
from the target point that will qualify the waypoint as complete. This
48-
command is not supported. Instead, the ``WPNAV_RADIUS`` parameter should be
48+
command is not supported. Instead, the :ref:`WP_RADIUS_M<WP_RADIUS_M>` parameter should be
4949
used (see "WP Radius" field in the above screenshot or adjust through the
50-
Standard Parameters List). Even the ``WPNAV_RADIUS`` is only used when the
50+
Standard Parameters List). Even the :ref:`WP_RADIUS_M<WP_RADIUS_M>` is only used when the
5151
waypoint has a Delay. With no delay specified the waypoint will be
5252
considered complete when the virtual point that the vehicle is chasing
5353
reaches the waypoint. This can be 10m (or more) ahead of the vehicle

copter/source/docs/rtl-mode.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ When RTL mode is selected, the copter will return to the home location, or if ra
1616

1717
The copter will first rise a minimum of :ref:`RTL_CLIMB_MIN<RTL_CLIMB_MIN>` or to ``RTL_ALT``, whichever is higher, before returning home. The default value for ``RTL_ALT`` is 15m. Under no circumstances will this altitude be below 30cm.
1818

19-
The altitude reference frame is set by either the rally point, if proceeding to one of those, or by :ref:`RTL_ALT_TYPE<RTL_ALT_TYPE>` to select relative to HOME, or Terrain. If ``WPNAV_RFND_USE`` = 1 and Terrain is selected, then rangefinder will be used.
19+
The altitude reference frame is set by either the rally point, if proceeding to one of those, or by :ref:`RTL_ALT_TYPE<RTL_ALT_TYPE>` to select relative to HOME, or Terrain. If :ref:`WP_RFND_USE<WP_RFND_USE>` = 1 and Terrain is selected, then rangefinder will be used.
2020

2121
.. image:: ../images/RTL.jpg
2222
:target: ../_images/RTL.jpg
@@ -89,7 +89,7 @@ Options (User Adjustable Parameters)
8989
- :ref:`RTL_SPEED <RTL_SPEED>`:
9090
The horizontal speed (in cm/s) at which the vehicle will return to
9191
home. By default this value is zero meaning it will use
92-
``WPNAV_SPEED``.
92+
:ref:`WP_SPD<WP_SPD>`.
9393

9494
- :ref:`RTL_CONE_SLOPE <RTL_CONE_SLOPE>`:
9595
Defines the slope of an inverted cone above home which is used
@@ -102,9 +102,9 @@ Notes
102102

103103
- Other navigation settings also have an influence over RTL mode:
104104

105-
- ``WPNAV_ACCEL``
106-
- ``WPNAV_SPEED_DN``
107-
- ``WPNAV_SPEED_UP``
105+
- :ref:`WP_ACC<WP_ACC>`
106+
- :ref:`WP_SPD_DN<WP_SPD_DN>`
107+
- :ref:`WP_SPD_UP<WP_SPD_UP>`
108108

109109
- To use RTL, GPS lock needs to be achieved (Blue GPS LED and Blue APM
110110
LED on solid not blinking) before arming and takeoff to establish the
@@ -115,6 +115,6 @@ Notes
115115
set at the location of lock.
116116
- If you set the ``RTL_ALT`` to a number at other than 0 it will go to
117117
and maintain that altitude while returning.
118-
- RTL uses ``WPNAV_SPEED`` to determine how fast it travels.
118+
- RTL uses :ref:`WP_SPD<WP_SPD>` to determine how fast it travels.
119119
- Once the copter arrives at the home location the copter will pause
120120
for ``RTL_LOIT_TIME`` milliseconds, timeout (AUTO_LAND), then land.

copter/source/docs/smartrtl-mode.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Additional Failsafes that may be set to switch to SmartRTL are: :ref:`BATT_FS_CR
2525
SmartRTL Parameters
2626
===================
2727

28-
- :ref:`RTL_SPEED <RTL_SPEED>` can be used to set the speed (in meters/second) at which the vehicle will return to home. By default this parameter is zero meaning the ``WPNAV_SPEED`` parameter value will be used.
28+
- :ref:`RTL_SPEED <RTL_SPEED>` can be used to set the speed (in meters/second) at which the vehicle will return to home. By default this parameter is zero meaning the :ref:`WP_SPD<WP_SPD>` parameter value will be used.
2929
- ``RTL_ALT_FINAL`` if set to 0, will land at home, otherwise will stop and hover above home at this altitude upon completion of the return.
3030
- :ref:`SRTL_ACCURACY <SRTL_ACCURACY>` controls the accuracy (in meters) of the simplification and pruning performed. The simplify algorithm will turn curved paths into straight lines but the line should never be more than this distance from the original path. The pruning algorithm will cut paths that come within this many meters of each other.
3131
- :ref:`SRTL_POINTS <SRTL_POINTS>` controls the maximum number of points that can be stored. Each additional 100 points requires about 3k of RAM and the image below shows how to check the autopilot's available memory (most autopilots have enough memory for 500 points). If the maximum number of points is exhausted, "SmartRTL deactivated: buffer full" will be sent to the ground station and the user will not be able to switch into SmartRTL.

0 commit comments

Comments
 (0)