From ac3ffcbe428b5a9aec2f63ccff0e56208c021364 Mon Sep 17 00:00:00 2001 From: Stephen Dade Date: Wed, 1 Sep 2021 15:32:11 +1000 Subject: [PATCH] Copter: Update terrain generator details --- common/source/docs/common-terrain-following.rst | 2 +- copter/source/docs/terrain-following.rst | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/source/docs/common-terrain-following.rst b/common/source/docs/common-terrain-following.rst index 13981874c1..7c8874b72a 100644 --- a/common/source/docs/common-terrain-following.rst +++ b/common/source/docs/common-terrain-following.rst @@ -116,7 +116,7 @@ You can also download .zip files for entire continents, or individual tiles from .. warning:: A long standing bug in the downloaded terrain data files, which occasionally caused terrain data to be missing, even though supposedly downloaded, was fixed in Plane 4.0.6, Copter 4.0.4, and Rover 4.1. It will automatically be re-downloaded when connected to a compatible GCS. However, if you are relying on SD terrain data for an area and don't plan on being connected to a GCS when flying over it, or it's not part of a mission, you should download the area data using the utility above, or linked tiles data repository and place on your SD card in the Terrain directory. -.. warning:: ArduPilot 4.0.x and 4.1.x use different terrain tilesets. When upgrading from 4.0.x to 4.1.x, any tiles on the SD card will need to be re-downloaded. This will happen automatically when your GCS is connected to the Internet. Otherwise, you may set the :ref:`TERRAIN_MARGIN ` to 50 to continue using the old tileset. +.. warning:: ArduPilot 4.0.x and 4.1.x use different terrain tilesets. When upgrading from 4.0.x to 4.1.x, any tiles on the SD card will need to be re-downloaded. This will happen automatically when your GCS is connected to the Internet for areas covered by loaded missions and/or home location. Otherwise, you may set the :ref:`TERRAIN_MARGIN ` to 50 to continue using the old tileset. Terrain Spacing =============== diff --git a/copter/source/docs/terrain-following.rst b/copter/source/docs/terrain-following.rst index 1d08aafd0a..d9868ac1d5 100644 --- a/copter/source/docs/terrain-following.rst +++ b/copter/source/docs/terrain-following.rst @@ -47,10 +47,12 @@ Alternatively, you can download a set of terrain data tiles for any anticipated It will create tiles for the specified radius around a geographic location. Then you can download them, unzip and write in the APM/TERRAIN folder of the SD card. -You can also download .zip files for entire continents, or individual tiles from `here `__. +You can also download .zip files for entire continents, or individual tiles from `here `__. Note that ArduPilot 4.0.x and 4.1.x have different tilesets. Use the "continents"/"tiles" folders for ArduPilot 4.0.x, or use the "continentsapm41"/"tilesapm41" folders for ArduPilot 4.1.x. .. warning:: A long standing bug in the downloaded terrain data files, which occasionally caused terrain data to be missing, even though supposedly downloaded, was fixed in Plane 4.0.6, Copter 4.0.4, and Rover 4.1. It will automatically be re-downloaded when connected to a compatible GCS. However, if you are relying on SD terrain data for an area and don't plan on being connected to a GCS when flying over it, or its not part of a mission, you should download the area data using the utility above, or from the linked tiles data repository and place on your SD card in the Terrain directory. +.. warning:: ArduPilot 4.0.x and 4.1.x use different terrain tilesets. When upgrading from 4.0.x to 4.1.x, any tiles on the SD card will need to be re-downloaded. This will happen automatically when your GCS is connected to the Internet for areas covered by loaded missions and/or home location. Otherwise, you may set the :ref:`TERRAIN_MARGIN ` to 50 to continue using the old tileset. + Using Terrain Altitude during RTL and Land ========================================== Set the :ref:`TERRAIN_FOLLOW ` parameter to 1 to enable using terrain data in :ref:`RTL ` and :ref:`Land ` flight modes. If set the vehicle will interpret the :ref:`RTL_ALT ` as an altitude-above-terrain meaning it will generally climb over hills on it's return path to home. Similarly Land will slow to the :ref:`LAND_SPEED ` (normally 50cm/s) when it is 10m above the terrain (instead of 10m above home).