OPLM link in Revo docs, new CC3D ReceiverPort table

UncleRus · Dec 27, 2015 · 3f39a24 · 3f39a24
1 parent ac222d7
commit 3f39a24
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 49 deletions.
diff --git a/source/conf.py b/source/conf.py
@@ -46,9 +46,9 @@
 
 
 # General information about the project.
-project = u'OpenPilot/LibrePilot Wiki'
+project = u'LibrePilot/OpenPilot Wiki'
 
-copyright = u'OpenPilot/LibrePilot community'
+copyright = u'LibrePilot/OpenPilot community'
 
 
 # The version info for the project you're documenting, acts as replacement for
@@ -59,7 +59,7 @@
 version = u'0.1'
 
 # The full version, including alpha/beta/rc tags.
-release = u'0.1.3'
+release = u'0.1.4'
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -103,6 +103,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 html_theme = "sphinx_rtd_theme"
+#html_theme = "nature"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

diff --git a/source/user_manual/cc3d/cc3d.rst b/source/user_manual/cc3d/cc3d.rst
@@ -235,53 +235,48 @@ connect your telemetry or Spektrum satellite.
 ReceiverPort
 ^^^^^^^^^^^^
 
-+--------+--------------------------+------------+-----------------------+
-| Color  | Function                 | JST-SH Pin | Servo connector plug, |
-|        |                          |            | ReceiverPort pin      |
-+========+==========================+============+=======================+
-| Black  | Ground                   | 1          | 1                     |
-+--------+--------------------------+------------+-----------------------+
-| Red    | Power to RC RX (VCC      | 2          | 1                     |
-|        | Unregulated) 4.8V - 15V  |            |                       |
-+--------+--------------------------+------------+-----------------------+
-| White  | PWM Signal 1 or combined | 3          | 1                     |
-|        | PPM                      |            |                       |
-+--------+--------------------------+------------+-----------------------+
-| Blue   | PWM Signal 2             | 4          | 2                     |
-+--------+--------------------------+------------+-----------------------+
-| Yellow | PWM Signal 3 or PWM      | 5          | 3                     |
-|        | Output channel 7         |            |                       |
-+--------+--------------------------+------------+-----------------------+
-| Green  | PWM Signal 4 or PWM      | 6          | 4                     |
-|        | Output channel 8         |            |                       |
-+--------+--------------------------+------------+-----------------------+
-| Orange | PWM Signal 5 or PWM      | 7          | 5                     |
-|        | Output channel 9         |            |                       |
-+--------+--------------------------+------------+-----------------------+
-| Purple | PWM Signal 6 or PWM      | 8          | 6                     |
-|        | Output channel 10        |            |                       |
-+--------+--------------------------+------------+-----------------------+
++-----+--------+---------------+---------------+-------------------+-----------------------+------------------+-----------------+
+| Pin | Color  | PWM+NoOneShot | PPM+NoOneShot | PPM+PWM+NoOneShot | PPM+Outputs+NoOneShot | PPM_PIN8+OneShot | Outputs+OneShot |
+|     |        | Function      | Function      | Function          | Function              | Function         | Function        |
++=====+========+===============+===============+===================+=======================+==================+=================+
+| 1   | Black  | GND           | GND           | GND               | GND                   | GND              | GND             |
++-----+--------+---------------+---------------+-------------------+-----------------------+------------------+-----------------+
+| 2   | Red    | PWR Out (VCC  | PWR Out (VCC  | PWR Out (VCC      | PWR Out (VCC          | PWR Out (VCC     | PWR Out (VCC    |
+|     |        | Unregulated)  | Unregulated)  | Unregulated)      | Unregulated)          | Unregulated)     | Unregulated)    |
++-----+--------+---------------+---------------+-------------------+-----------------------+------------------+-----------------+
+| 3   | White  | PWM input 1   | PPM input     | PPM input         | PPM input             | ---              | ---             |
++-----+--------+---------------+---------------+-------------------+-----------------------+------------------+-----------------+
+| 4   | Blue   | PWM input 2   | ---           | PWM input 2       | ---                   | ---              | ---             |
++-----+--------+---------------+---------------+-------------------+-----------------------+------------------+-----------------+
+| 5   | Yellow | PWM input 3   | ---           | PWM input 3       | PWM output 7          | ---              | PWM output 7    |
++-----+--------+---------------+---------------+-------------------+-----------------------+------------------+-----------------+
+| 6   | Green  | PWM input 4   | ---           | PWM input 4       | PWM output 8          | ---              | PWM output 8    |
++-----+--------+---------------+---------------+-------------------+-----------------------+------------------+-----------------+
+| 7   | Orange | PWM input 5   | ---           | PWM input 5       | PWM output 9          | ---              | PWM output 9    |
++-----+--------+---------------+---------------+-------------------+-----------------------+------------------+-----------------+
+| 8   | Purple | PWM input 6   | ---           | PWM input 6       | PWM output 10         | PPM input        | PWM output 10   |
++-----+--------+---------------+---------------+-------------------+-----------------------+------------------+-----------------+
 
 .. image:: img/JSH-SH-8pin.png
 
 MainPort and FlexiPort serial cable pinout
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-+--------+--------+---------------+--------------+--------------+--------------+--------------+
-| Color  | JST-SH | Voltage       | Serial       | I2C          | Spektrum     | S.Bus        |
-|        | Pin    |               | Function     | Function     |              |              |
-+========+========+===============+==============+==============+==============+==============+
-| Black  | 1      | GND           | GND          | GND          | GND          | GND          |
-+--------+--------+---------------+--------------+--------------+--------------+--------------+
-| Red    | 2      | 4.8V -        | PWR          | PWR          | PWR          | PWR          |
-|        |        | 15V           | Out (VCC     | Out (VCC     | Out (VCC     | Out (VCC     |
-|        |        |               | Unregulated) | Unregulated) | Unregulated) | Unregulated) |
-+--------+--------+---------------+--------------+--------------+--------------+--------------+
-| Blue   | 3      | 3.3V          | TX           | SCL          |              |              |
-+--------+--------+---------------+--------------+--------------+--------------+--------------+
-| Orange | 4      | 3.3V          | RX           | SDA          | TX           | TX           |
-|        |        | (5V Tolerant) |              |              | (Signal)     | (Signal)     |
-+--------+--------+---------------+--------------+--------------+--------------+--------------+
++-----+--------+---------------+--------------+--------------+--------------+--------------+
+| Pin | Color  | Voltage       | Serial       | I2C          | Spektrum     | S.Bus        |
+|     |        |               | Function     | Function     |              |              |
++=====+========+===============+==============+==============+==============+==============+
+| 1   | Black  | GND           | GND          | GND          | GND          | GND          |
++-----+--------+---------------+--------------+--------------+--------------+--------------+
+| 2   | Red    | 4.8V -        | PWR          | PWR          | PWR          | PWR          |
+|     |        | 15V           | Out (VCC     | Out (VCC     | Out (VCC     | Out (VCC     |
+|     |        |               | Unregulated) | Unregulated) | Unregulated) | Unregulated) |
++-----+--------+---------------+--------------+--------------+--------------+--------------+
+| 3   | Blue   | 3.3V          | TX           | SCL          | ---          | ---          |
++-----+--------+---------------+--------------+--------------+--------------+--------------+
+| 4   | Orange | 3.3V          | RX           | SDA          | TX           | TX           |
+|     |        | (5V Tolerant) |              |              | (Signal)     | (Signal)     |
++-----+--------+---------------+--------------+--------------+--------------+--------------+
 
 .. image:: img/JSH-SH-4pin.png
 

diff --git a/source/user_manual/revo/revo.rst b/source/user_manual/revo/revo.rst
@@ -427,11 +427,11 @@ And all these at the same time.
 OPLink Modem
 ^^^^^^^^^^^^
 
-The Revolution has its own OPLink Mini built right onto the board! This is not
-only a 10DoF flight controller with an ST32F4 processor in the same small
-footprint as the CC3D, but also has its own LRS modem. The modem is directly
-powered from the Revolution itself, so you don't need to worry about any
-additional power supply.
+The Revolution has its own :doc:`OPLink Mini <../oplink/index>` built right
+onto the board! This is not only a 10DoF flight controller with an ST32F4
+processor in the same small footprint as the CC3D, but also has its own LRS
+modem. The modem is directly powered from the Revolution itself, so you don't
+need to worry about any additional power supply.
 
 Of course, the on-board modem will have the same functionality as the OPLink
 Mini. Both are fully configurable from the GCS.