summaryrefslogtreecommitdiff
path: root/docs/pyboard
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2018-09-27 17:27:57 +1000
committerDamien George <damien.p.george@gmail.com>2018-10-01 13:53:53 +1000
commitb3e013f60ec0feb5b64bcadb45b154d093731c97 (patch)
treecb0f4b4368d024b2cfa6044027e871304d3bdd82 /docs/pyboard
parent5cc9517fc5d2524aa53dbf40854ac33d27f238ca (diff)
docs: Unify all the ports into one set of documentation.
With this commit there is now only one entry point into the whole documentation, which describes the general MicroPython language, and then from there there are links to information about specific platforms/ports. This commit doesn't change content (almost, it does fix a few internal links), it just reorganises things.
Diffstat (limited to 'docs/pyboard')
-rw-r--r--docs/pyboard/general.rst4
-rw-r--r--docs/pyboard/hardware/index.rst2
-rw-r--r--docs/pyboard/quickref.rst11
-rw-r--r--docs/pyboard/tutorial/fading_led.rst2
-rw-r--r--docs/pyboard/tutorial/index.rst2
5 files changed, 16 insertions, 5 deletions
diff --git a/docs/pyboard/general.rst b/docs/pyboard/general.rst
index 97e9aabc0..0fc7332de 100644
--- a/docs/pyboard/general.rst
+++ b/docs/pyboard/general.rst
@@ -1,3 +1,5 @@
+.. _pyboard_general:
+
General information about the pyboard
=====================================
@@ -77,4 +79,6 @@ including setting up the serial prompt and downloading new firmware using
DFU programming:
`PDF guide <http://micropython.org/resources/Micro-Python-Windows-setup.pdf>`__.
+.. _hardware_index:
+
.. include:: hardware/index.rst
diff --git a/docs/pyboard/hardware/index.rst b/docs/pyboard/hardware/index.rst
index 91fea24e7..d6a14b2c5 100644
--- a/docs/pyboard/hardware/index.rst
+++ b/docs/pyboard/hardware/index.rst
@@ -1,5 +1,3 @@
-.. _hardware_index:
-
The pyboard hardware
--------------------
diff --git a/docs/pyboard/quickref.rst b/docs/pyboard/quickref.rst
index 87a7bba3e..ec789f2f0 100644
--- a/docs/pyboard/quickref.rst
+++ b/docs/pyboard/quickref.rst
@@ -1,4 +1,4 @@
-.. _quickref:
+.. _pyboard_quickref:
Quick reference for the pyboard
===============================
@@ -20,6 +20,15 @@ or `PYBLITEv1.0 <http://micropython.org/resources/pyblitev10-pinout.jpg>`__.
.. image:: http://micropython.org/resources/pybv10-pinout-800px.jpg
:alt: PYBv1.0 pinout
+Below is a quick reference for the pyboard. If it is your first time working with
+this board please consider reading the following sections first:
+
+.. toctree::
+ :maxdepth: 1
+
+ general.rst
+ tutorial/index.rst
+
General board control
---------------------
diff --git a/docs/pyboard/tutorial/fading_led.rst b/docs/pyboard/tutorial/fading_led.rst
index 9f3f7c3ad..8303c9603 100644
--- a/docs/pyboard/tutorial/fading_led.rst
+++ b/docs/pyboard/tutorial/fading_led.rst
@@ -26,7 +26,7 @@ For this tutorial, we will use the ``X1`` pin. Connect one end of the resistor t
Code
----
-By examining the :ref:`quickref`, we see that ``X1`` is connected to channel 1 of timer 5 (``TIM5 CH1``). Therefore we will first create a ``Timer`` object for timer 5, then create a ``TimerChannel`` object for channel 1::
+By examining the :ref:`pyboard_quickref`, we see that ``X1`` is connected to channel 1 of timer 5 (``TIM5 CH1``). Therefore we will first create a ``Timer`` object for timer 5, then create a ``TimerChannel`` object for channel 1::
from pyb import Timer
from time import sleep
diff --git a/docs/pyboard/tutorial/index.rst b/docs/pyboard/tutorial/index.rst
index 1dc155f14..666c2de4f 100644
--- a/docs/pyboard/tutorial/index.rst
+++ b/docs/pyboard/tutorial/index.rst
@@ -1,4 +1,4 @@
-.. _tutorial-index:
+.. _pyboard_tutorial:
MicroPython tutorial for the pyboard
====================================