Skip to content

Commit

Permalink
Cosmetic changes
Browse files Browse the repository at this point in the history
  • Loading branch information
UncleRus committed Nov 18, 2015
1 parent f9343c0 commit c004881
Show file tree
Hide file tree
Showing 24 changed files with 42 additions and 40 deletions.
4 changes: 2 additions & 2 deletions source/user_manual/cc3d.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CopterControl - CC3D - Atom Hardware Setup
CopterControl / CC3D / Atom Hardware Setup
==========================================

CopterControl3D (CC3D and Atom) and CopterControl Introduction
Expand Down Expand Up @@ -294,7 +294,7 @@ Receiver PWM connection

There are several ways to connect your receiver to CopterControl. You can
connect any plug from the CopterControl receiver cable to any channel of your
receiver. The correct channel mapping is done in the GCS :doc:`/gcs/input`.
receiver. The correct channel mapping is done in the GCS `<https://librepilot.atlassian.net/wiki/display/LPDOC/Input+Configuration>`_.
However as a guideline for a standard PWM receiver, you may want to connect
it as follows:

Expand Down
20 changes: 10 additions & 10 deletions source/user_manual/firmware.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,34 +20,34 @@ the firmware on the various OpenPilot boards follow these steps:
of this Wiki, the :doc:`gcs_install` page)
#. Read through the informational documentation for CC/CC3D and/or Revolution
page by using the links at the bottom of this page.
#. Once familiar with your board's functions, find the Welcome tab of the GCS
and with your board plugged in, proceed through the Vehicle Setup Wizard for
Multirotor or Fixed Wing.
#. Once familiar with your board's functions, find the **Welcome** tab of the GCS
and with your board plugged in, proceed through the **Vehicle Setup Wizard**
for Multirotor or Fixed Wing.

For vehicles other than MultiRotor or Fixed Wing, or to install firmware
For vehicles other than Multirotor or Fixed Wing, or to install firmware
manually (without the wizard) you must take the following steps to ensure that
your firmware is updated correctly:

#. Uninstall any previous versions of OpenPilot GCS
#. Install the latest OpenPilot GCS version (available from the previous page
of this Wiki, the Downloading and Installing the Ground Control Station page)
#. Open the OpenPilot GCS and go to the Firmware Tab
#. With the board unplugged, click the Rescue button
#. Open the OpenPilot GCS and go to the **Firmware** Tab
#. With the board unplugged, click the **Rescue** button
#. Connect the board
#. (There's a chance that the new drivers might not finish installing before
the timer runs out. If this happens, wait until the drivers finish their
install, then unplug the board, click Rescue again, connect the board and
continue)
#. and click the Erase Settings button.
#. and click the **Erase Settings** button.
#. Wait approximately 30 seconds
#. Click the Upgrade & Erase button and follow the on-screen instructions
#. Click the **Upgrade & Erase** button and follow the on-screen instructions
#. Firmware install/update complete.

.. warning:: Never install any firmware on your board that came from untrusted
source! Trusted sources are the OpenPilot Downloads page or firmware that you
have built yourself from the official git repository.

Next, Select your Flight Controller:
Next, select your flight controller:

* :doc:`CC - CC3D - Atom <cc3d>`
* :doc:`CC / CC3D / Atom <cc3d>`
* :doc:`Revolution <revo/index>`
2 changes: 1 addition & 1 deletion source/user_manual/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ OpenPilot User Manual

gcs_install
firmware
revo/index
cc3d
revo/index
multirotor_hw
multirotor_wizard
first_flight
Expand Down
6 changes: 3 additions & 3 deletions source/user_manual/oplink/binding.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Coordinator side
#. Write down the Device ID. You are going to use it later.
#. Disconnect from the coordinating module.

.. image:: /img/oplm_bind_coord.png
.. image:: img/oplm_bind_coord.png

The OPLink Save button will display a green "tick" when settings are saved, but
it can disappear soon after settings are saved. This is normal behavior.
Expand All @@ -100,7 +100,7 @@ Slave side
the bottom of the GCS) to calm down.
#. Disconnect from the slave module. The bind is complete.

.. image:: /img/oplm_bind_slave.png
.. image:: img/oplm_bind_slave.png


Testing the link for the first time
Expand Down Expand Up @@ -128,7 +128,7 @@ Congratulations! Your OPLink telemetry connection is now ready for use. If you
wish to use the connection for vehicle control also, proceed to the
:doc:`control` page.

.. image:: /img/oplm_bind_success.png
.. image:: img/oplm_bind_success.png


Advanced topics
Expand Down
6 changes: 3 additions & 3 deletions source/user_manual/oplink/bluetooth.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ does for Virtual COM port ComBridge operation.
HW method 1: Using an FTDI adapter
""""""""""""""""""""""""""""""""""

.. image:: /img/bt_connect.png
.. image:: img/bt_connect.png

Most R/C hobbyists are familiar with FTDI USB to serial adapters. This is
probably the easiest method to connect to the Bluetooth module. An FTDI module
Expand Down Expand Up @@ -142,7 +142,7 @@ Connecting the Bluetooth module to OpenPilot devices
Connecting directly to the flight controller
""""""""""""""""""""""""""""""""""""""""""""

.. image:: /img/bt_flight.png
.. image:: img/bt_flight.png

For direct connection from the flight controller to the Bluetooth module, the
wiring is exactly the same as USB VCP ComBridge wiring. The flight controller
Expand All @@ -164,7 +164,7 @@ has to be configured to output telemetry data at the correct baud rate.
Connecting to OPLink ground module
""""""""""""""""""""""""""""""""""

.. image:: /img/oplm_bluetooth.jpg
.. image:: img/oplm_bluetooth.jpg

For completely wireless telemetry with OPLink and Bluetooth module, the wiring
has to be connected according to the diagram above. OPLink vehicle control is
Expand Down
6 changes: 3 additions & 3 deletions source/user_manual/oplink/cc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ two boards. It is recommended to use Main port for both boards, but you can
also use other ports to connect telemetry. Just remember the changes in the
Configuration steps below. Connect the boards like in the diagram:

.. image:: /img/CC-OPLM-Telemetry.png
.. image:: img/CC-OPLM-Telemetry.png
:width: 600

Telemetry and vehicle control
Expand All @@ -40,7 +40,7 @@ input pin on the flight controller. In this diagram the wire goes to PIN 8 on
the controller, because that is the pin that allows OneShot125 and PWM Sync with
CC3D. Revolution PPM remains on PIN 3.

.. image:: /img/CC-OPLM-Telemetry+PPM.png
.. image:: img/CC-OPLM-Telemetry+PPM.png
:width: 600

Configuration
Expand All @@ -60,7 +60,7 @@ Flight-side OPLink modem configuration
* Click **Save**, wait a few seconds for the telemetry gadget (the meter at the
bottom of the GCS) to calm down, and disconnect from the modem.

.. image:: /img/oplm_cc_flight.png
.. image:: img/oplm_cc_flight.png
:width: 500

Flight controller configuration
Expand Down
6 changes: 3 additions & 3 deletions source/user_manual/oplink/control.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ You will need to supply power and control data from the transmitter to the
OPLink module. The OPLink Mini module requires three wires for normal operation
with a transmitter.

.. image:: /img/oplm_control.jpg
.. image:: img/oplm_control.jpg
:width: 500

* Ground
Expand Down Expand Up @@ -67,13 +67,13 @@ cable in half and use that to make a neat connection to the transmitter. If you
cut a trainer cable, you'll have to identify the correct wires with a
multimeter.

.. image:: /img/oplm_tx_pinout.jpg
.. image:: img/oplm_tx_pinout.jpg
:width: 500

Mounting the OPLink module to the transmitter
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

.. image:: /img/oplm_tx.jpg
.. image:: img/oplm_tx.jpg
:width: 500

There are many ways to attach the OPLink mini module to your transmitter. The
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
5 changes: 3 additions & 2 deletions source/user_manual/oplink/overview.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Overview
--------

.. image:: /img/oplink_mini.png
.. image:: img/oplink_mini.png

The OPLink is a radio transceiver backed by an ARM32 powered digital packet
processor specifically designed for the OpenPilot project, it was originally
Expand Down Expand Up @@ -85,7 +85,7 @@ Schematics, PCB Layout, Gerbers, BOM:
Serial Bluetooth RF Transceiver Module RS232
--------------------------------------------

.. image:: /img/Bluetooth.jpg
.. image:: img/Bluetooth.jpg

This small size Bluetooth TTL transceiver module allows your target device to
both send or receive the TTL data via Bluetooth technology without connecting a
Expand All @@ -107,6 +107,7 @@ The boards generally ship for around 10$ - 20$. Although the hardware is the
same, several software or firmware revisions exist.

Different input voltage versions
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

.. important:: There are different versions available; 3VDC or 5VDC. You want
the 5VDC version in order to connect directly to CopterControl. This module
Expand Down
6 changes: 3 additions & 3 deletions source/user_manual/revo/index.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
****************
Revolution Board
****************
**********************
Revolution Board Setup
**********************

.. toctree::
:maxdepth: 2
Expand Down
21 changes: 11 additions & 10 deletions source/user_manual/revo/voltage_current.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,17 @@ Current / Voltage sensor

Here is a list of common Attopilot sensors that can be used:

+---------------------+----------------------+---------------+---------------+-------------+-------------+
| Module Type | Sensitivity | VoltageFactor | CurrentFactor | VoltageZero | CurrentZero |
+=====================+======================+===============+===============+=============+=============+
| Attopilot 13.6V/45A | 242.3mV/V, 73.20mV/A | 4.127 | 13.661 | 0 | 0 |
+---------------------+----------------------+---------------+---------------+-------------+-------------+
| Attopilot 50V/90A, | 63.69mV/V, 36.60mV/A | 15.701 | 27.322 | 0 | 0 |
| RCTIMER 90A | | | | | |
+---------------------+----------------------+---------------+---------------+-------------+-------------+
| Attopilot 50V/180A | 63.69mV/V, 18.30mV/A | 15.701 | 54.645 | 0 | 0 |
+---------------------+----------------------+---------------+---------------+-------------+-------------+
+--------------------------+----------------------+---------------+---------------+-------------+-------------+
| Module Type | Sensitivity | VoltageFactor | CurrentFactor | VoltageZero | CurrentZero |
+==========================+======================+===============+===============+=============+=============+
| Attopilot 13.6V/45A | 242.3mV/V, 73.20mV/A | 4.127 | 13.661 | 0 | 0 |
+--------------------------+----------------------+---------------+---------------+-------------+-------------+
| Attopilot 50V/90A [#f1]_ | 63.69mV/V, 36.60mV/A | 15.701 | 27.322 | 0 | 0 |
+--------------------------+----------------------+---------------+---------------+-------------+-------------+
| Attopilot 50V/180A | 63.69mV/V, 18.30mV/A | 15.701 | 54.645 | 0 | 0 |
+--------------------------+----------------------+---------------+---------------+-------------+-------------+

.. [#f1] Same as RCTIMER 90A current sensor
For custom sensor see the :ref:`calc_sensor_calibration` section.

Expand Down

0 comments on commit c004881

Please sign in to comment.