Skip to content

Commit

Permalink
Merge branch 'master' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
ot0tot authored Sep 25, 2024
2 parents 463510a + 6758903 commit 6e33a05
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 4 deletions.
20 changes: 18 additions & 2 deletions common/source/docs/common-CUAV-7-Nano.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ CUAV-7-Nano Flight Controller
=============================

The CUAV-7-Nano flight controller produced by `CUAV <https://www.cuav.net>`_.
It has an ultra-small size and a 100M Ethernet interface. Supports 3.3V/5V PWM output.

.. image:: ../../../images/7-nano/7-nano.jpg
:target: ../_images/7-nano/7-nano.jpg

Features
========
Expand All @@ -23,11 +27,18 @@ Features
* Analog RSSI input
* 3.3V/5V configurable PWM ouput voltage

Size
====

.. image:: ../../../images/7-nano/7-nano-size.png
:target: ../_images/7-nano/7-nano-size.png

Pinout
======

.. image:: ../../../images/CUAV-7-Nano-pinout.png
:target: ../_images/CUAV-7-Nano-pinout.png
.. image:: ../../../images/7-nano/7-nano-pinouts.png
:target: ../_images/7-nano/7-nano-pinouts.png


UART Mapping
============
Expand Down Expand Up @@ -123,3 +134,8 @@ Firmware for these boards can be found at https://firmware.ardupilot.org in sub-
The board comes pre-installed with an ArduPilot compatible bootloader, allowing the loading of \*.apj firmware files with any ArduPilot compatible ground station.

[copywiki destination="plane,copter,rover,blimp"]


CUAV docs
=========
`CUAV 7-Nano <https://https://doc.cuav.net/flight-controller/7-nano/en/>`__
4 changes: 2 additions & 2 deletions common/source/docs/common-crsf-telemetry.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
TBS Crossfire Telemetry
=======================

.. note:: ELRS (ExpressLRS) RC systems use the Crossfire protocol and are connected in a similar manner. However, it does not provide bi-directional telemetry like Crossfire.
.. note:: ELRS (ExpressLRS) RC systems use the CRSF protocol and are connected in a similar manner. ELRS receivers can also be used in Mavlink mode to provide both bidirectional Mavlink telemetry and RC control over a single TX-RX pair. Details `here <https://www.expresslrs.org/software/mavlink/>`_.

TBS CRSF Receivers incorporate telemetry along with RC control information in their interface to ArduPilot. ArduPilot supports native CRSF telemetry and extensions to it that allow using the :Ref:`common-frsky-yaapu`. See :ref:`common-tbs-rc` for connection and setup information.
TBS Crossfire Receivers incorporate telemetry along with RC control information in their interface to ArduPilot. ArduPilot supports native CRSF telemetry and extensions to it that allow using the :Ref:`common-frsky-yaapu`. See :ref:`common-tbs-rc` for connection and setup information.

OpenTx will discover the native CRSF Telemetry sensors (but a limited number, use passthru option below for more displayed information using Yaapu Telemetry script), which then can be displayed on `OpenTX <https://www.open-tx.org/>`_ telemetry screens or repeated from the CRSF TX module's WIFI to MAVLink Ground Control Stations:

Expand Down
15 changes: 15 additions & 0 deletions copter/source/docs/terrain-following.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,21 @@ It will create tiles for the specified radius around a geographic location. Then

You can also download .zip files for entire continents, or individual tiles from `here <https://terrain.ardupilot.org/data/>`__. 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.

Beginning with the beta version released on 20th September 2024 you can create terrain dat files from Mission Planner and upload them to the SD card.

- Go to FlightPlanner.
- Select area with ALT+MouseCLICK and drag
- Open context menu and select Make Terrain DAT

if no area is selected the actual displayed area is used.

If you loaded Digital Elevation Model files into Mission Planner, then the generated terrain file will use them as source. You can specify the spacing between 5 and 100 meters. (Smaller spacing is not possible due to a bug in Ardupilot code, which does not allow files larger than 2Gbyte)

A grid spacing of 100 meters is adequate for most uses, especially for fast-flying vehicles. Using a smaller grid spacing often results in unnecessary SD card storage consumption. However, in specific cases where precise terrain following is required—such as when spraying with a copter over uneven terrain—a smaller grid spacing can be beneficial.
Don't forget to match the terrain spacing parameter with the grid size you generated and uploaded.

Terrain data files are always created as one file per one-by-one degree area, the file size depends on the spacing.

.. 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 <TERRAIN_MARGIN>` to 50 to continue using the old tileset.
Expand Down
Binary file added images/7-nano/7-nano-pinouts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-nano/7-nano-size.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/7-nano/7-nano.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/CUAV-7-Nano-pinout.png
Binary file not shown.

0 comments on commit 6e33a05

Please sign in to comment.