Skip to content

Commit adf68ba

Browse files
committed
Fix docs build by splitting out support matrix
1 parent 2e7ab93 commit adf68ba

File tree

17 files changed

+118
-54
lines changed

17 files changed

+118
-54
lines changed

BUILDING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To compile (or recompile) mpy-cross:
4848

4949
make -C mpy-cross
5050

51-
# Building
51+
## Building
5252

5353
There a number of ports of CircuitPython! To build for your board, change to the appropriate ports directory and build.
5454

@@ -64,7 +64,7 @@ If you aren't sure what boards exist, have a peek in the boards subdirectory of
6464
If you have a fast computer with many cores, consider adding `-j` to your build flags, such as `-j17` on
6565
a 6-core 12-thread machine.
6666

67-
# Testing
67+
## Testing
6868

6969
If you are working on changes to the core language, you might find it useful to run the test suite.
7070
The test suite in the top level `tests` directory. It needs the unix port to run.
@@ -84,7 +84,7 @@ A successful run will say something like
8484
676 tests passed
8585
30 tests skipped: buffered_writer builtin_help builtin_range_binop class_delattr_setattr cmd_parsetree extra_coverage framebuf1 framebuf16 framebuf2 framebuf4 framebuf8 framebuf_subclass mpy_invalid namedtuple_asdict non_compliant resource_stream schedule sys_getsizeof urandom_extra ure_groups ure_span ure_sub ure_sub_unmatched vfs_basic vfs_fat_fileio1 vfs_fat_fileio2 vfs_fat_more vfs_fat_oldproto vfs_fat_ramdisk vfs_userfs
8686

87-
# Debugging
87+
## Debugging
8888

8989
The easiest way to debug CircuitPython on hardware is with a JLink device, JLinkGDBServer, and an appropriate GDB.
9090
Instructions can be found at https://learn.adafruit.com/debugging-the-samd21-with-gdb
@@ -99,7 +99,7 @@ Example:
9999
If your port/build includes `arm-none-eabi-gdb-py`, consider using it instead, as it can be used for better register
100100
debugging with https://github.com/bnahill/PyCortexMDebug
101101

102-
# Code Quality Checks
102+
## Code Quality Checks
103103

104104
We apply code quality checks using pre-commit. Install pre-commit once per system with
105105

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ For SAMD21 debugging workflow tips check out [this learn guide](https://learn.ad
3838
Scott Shawcroft ([@tannewt](https://github.com/tannewt)) is the lead developer of CircuitPython
3939
and is sponsored by [Adafruit Industries LLC](https://adafruit.com). Scott is usually available
4040
during US West Coast working hours. Dan Halbert ([@dhalbert](https://github.com/dhalbert)) and
41-
Kattni Rembor ([@kattni](https://github.com/kattni)) are also sponsored by [Adafruit Industries
42-
LLC](https://adafruit.com) and are usually available during US East Coast daytime hours including
43-
some weekends.
41+
Jeff Epler ([@jepler](https://github.com/jepler)) are also sponsored by [Adafruit Industries
42+
LLC](https://adafruit.com) and are usually available during US daytime hours including some
43+
weekends.
4444

4545
They are all reachable on [Discord](https://adafru.it/discord), GitHub issues and the [Adafruit
4646
support forum](https://forums.adafruit.com/viewforum.php?f=60).

README.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ Specifically useful documentation when starting out:
5656
- `CircuitPython Essentials <https://learn.adafruit.com/circuitpython-essentials>`__
5757
- `Example Code <https://github.com/adafruit/Adafruit_Learning_System_Guides/tree/master/CircuitPython_Essentials>`__
5858

59-
Code Search
60-
------------
61-
GitHub doesn't currently support code search on forks. Therefore, CircuitPython doesn't have code search through GitHub because it is a fork of MicroPython. Luckily, `SourceGraph <https://sourcegraph.com/github.com/adafruit/circuitpython>`_ has free code search for public repos like CircuitPython. So, visit `sourcegraph.com/github.com/adafruit/circuitpython <https://sourcegraph.com/github.com/adafruit/circuitpython>`_ to search the CircuitPython codebase online.
62-
6359
Contributing
6460
------------
6561

conf.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@ def autoapi_prepare_jinja_env(jinja_env):
218218
"ports/nrf/usb",
219219
"ports/raspberrypi/sdk",
220220
"ports/raspberrypi/lib",
221-
"ports/silabs",
221+
"ports/silabs/gecko_sdk",
222+
"ports/silabs/tools",
222223
"ports/stm/st_driver",
223224
"ports/stm/packages",
224225
"ports/stm/peripherals",
225226
"ports/stm/ref",
226-
"ports/unix",
227227
"py",
228228
"shared/*",
229229
"shared-bindings/util.*",
@@ -362,14 +362,21 @@ def autoapi_prepare_jinja_env(jinja_env):
362362
# Additional stuff for the LaTeX preamble.
363363
#'preamble': '',
364364
# Include 3 levels of headers in PDF ToC
365-
'preamble': '\setcounter{tocdepth}{2}',
365+
'preamble': r'''
366+
\setcounter{tocdepth}{2}
367+
\hbadness=99999
368+
\hfuzz=20pt
369+
\usepackage{pdflscape}
370+
''',
366371
}
367372

368373
# Grouping the document tree into LaTeX files. List of tuples
369374
# (source start file, target name, title,
370375
# author, documentclass [howto, manual, or own class]).
371376
latex_documents = [
372-
(master_doc, 'CircuitPython.tex', 'CircuitPython Documentation',
377+
("docs/pdf", 'CircuitPython.tex', 'CircuitPython Documentation',
378+
'CircuitPython Contributors', 'manual'),
379+
("shared-bindings/support_matrix", 'SupportMatrix.tex', 'Board Support Matrix',
373380
'CircuitPython Contributors', 'manual'),
374381
]
375382

docs/pdf.rst

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
:orphan:
2+
3+
Adafruit CircuitPython API Reference
4+
====================================
5+
6+
Welcome to the API reference documentation for Adafruit CircuitPython.
7+
This contains low-level API reference docs which may link out to separate
8+
*"getting started"* guides. `Adafruit <https://adafruit.com>`_ has many
9+
excellent tutorials available through the
10+
`Adafruit Learning System <https://learn.adafruit.com/>`_.
11+
12+
13+
.. toctree::
14+
:maxdepth: 3
15+
16+
../README.rst
17+
libraries.rst
18+
workflows
19+
environment.rst
20+
troubleshooting.rst
21+
../CONTRIBUTING
22+
../BUILDING
23+
../WEBUSB_README
24+
supported_ports.rst
25+
26+
Design and porting reference
27+
----------------------------
28+
29+
.. toctree::
30+
:maxdepth: 1
31+
32+
design_guide
33+
porting
34+
common_hal
35+
36+
API Reference
37+
----------------------
38+
39+
.. toctree::
40+
:glob:
41+
:maxdepth: 3
42+
43+
library/index.rst
44+
../shared-bindings/*/index
45+
../shared-bindings/help
46+
47+
48+
.. toctree::
49+
:maxdepth: 1
50+
51+
reference/glossary.rst
52+
../CODE_OF_CONDUCT
53+
../docs/LICENSE
54+
55+
Indices and tables
56+
==================
57+
58+
* :ref:`genindex`
59+
* :ref:`modindex`
60+
* :ref:`search`

docs/supported_ports.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ is limited.
1212
:maxdepth: 2
1313

1414
../ports/atmel-samd/README
15+
../ports/broadcom/README
1516
../ports/cxd56/README
1617
../ports/espressif/README
1718
../ports/litex/README
1819
../ports/mimxrt10xx/README
1920
../ports/nrf/README
2021
../ports/raspberrypi/README
22+
../ports/silabs/README
2123
../ports/stm/README
24+
../ports/unix/README

ports/broadcom/README.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Broadcom
2+
==================
3+
4+
This port supports running CircuitPython bare-metal on Raspberry Pi single board
5+
computers that utilize Broadcom system-on-chips.

ports/cxd56/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CircuitPython port to Spresense #
1+
# CXD56 (Spresense) #
22

33
This directory contains the port of CircuitPython to Spresense. It is a compact
44
development board based on Sony’s power-efficient multicore microcontroller

ports/espressif/README.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CircuitPython on Espressif SoCs
1+
Espressif
22
=======================================
33

44
This port adds the Espressif line of SoCs to CircuitPython.
@@ -10,9 +10,11 @@ Support Status:
1010
:header: SoC, Status
1111

1212
ESP32, "beta"
13+
ESP32-H2, "alpha"
1314
ESP32-C3, "beta"
15+
ESP32-C6, "alpha"
1416
ESP32-S2, "stable"
15-
ESP32-S3, "beta"
17+
ESP32-S3, "stable"
1618

1719
How this port is organized:
1820
---------------------------------------

ports/mimxrt10xx/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# CircuitPython Port To The NXP i.MX RT10xx Series
1+
# NXP i.MX RT10xx Series
22

33
This is a port of CircuitPython to the i.MX RT10xx series of chips.

ports/nrf/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CircuitPython Port To The Nordic Semiconductor nRF52 Series
1+
# Nordic Semiconductor nRF52 Series
22

33
This is a port of CircuitPython to the Nordic Semiconductor nRF52 series of chips.
44

ports/raspberrypi/README.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ Port Specific modules
1515
---------------------
1616

1717
.. toctree::
18+
../../shared-bindings/cyw43/index
19+
../../shared-bindings/picodvi/index
1820
../../shared-bindings/rp2pio/index

ports/silabs/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CircuitPython on EFR32 #
1+
# Silicon Labs EFR32 #
22

33
![GitHub](https://img.shields.io/badge/Technology-Bluetooth_BLE-green)
44
![GitHub](https://img.shields.io/badge/CircuitPython-8.1.0--beta.0-green)
@@ -84,29 +84,29 @@ Flash the project by using [Simplicity Commander](https://community.silabs.com/s
8484

8585
### Connecting to the Serial Console ###
8686

87-
Connect the devkit to the PC via the USB cable. The board usesserial for REPL access and debugging because the EFR32 chips has no USB support.
87+
Connect the devkit to the PC via the USB cable. The board uses serial for REPL access and debugging because the EFR32 chips has no USB support.
8888

8989
#### Windows ####
9090

91-
On Windows, we need to install a serial console e.g., PuTTY, MobaXterm. The JLink CDC UART Port can be found in the DeviceManager.
91+
On Windows, we need to install a serial console e.g., PuTTY, MobaXterm. The JLink CDC UART Port can be found in the Device Manager.
9292

9393
#### Linux ####
9494

9595
Open a terminal and issue the following command:
9696

9797
ls /dev/ttyACM*
9898

99-
Then note down the correct name and substitutecom-port-namein the following command with it:
99+
Then note down the correct name and substitute `com-port-name` in the following command with it:
100100

101101
screen /dev/'com-port-name'
102102

103103
### Using the REPL prompt ###
104104

105-
After flashing the firmware to the board, at your first connecting to the board, you might see a blank screen. Press enter and you should be presented with a Circuitpython prompt,>>>. If not, try to reset the board (see instructions below).
105+
After flashing the firmware to the board, at your first connecting to the board, you might see a blank screen. Press enter and you should be presented with a Circuitpython prompt,`>>>`. If not, try to reset the board (see instructions below).
106106

107107
You can now type in simple commands such as:
108108

109-
>>> print("Hello world!")
109+
>>> print("Hello world!")
110110
Hello world!
111111

112112
If something goes wrong with the board, you can reset it. Pressing CTRL+D when the prompt is open performs a soft reset.
@@ -119,13 +119,13 @@ Config serial: Tools > Options > Interpreter > Select MicroPython > Select Port
119119

120120
### Running CircuitPython scripts ###
121121

122-
At the boot stage, two scripts will be run (if not booting in safe mode). First, the fileboot.pywill be executed.The file **boot.py** can be used to perform the initial setup. Then, afterboot.pyhas been completed, the file**code.py** will be executed.
122+
At the boot stage, two scripts will be run (if not booting in safe mode). First, the file `boot.py` will be executed. The file `boot.py` can be used to perform the initial setup. Then, after `boot.py` has been completed, the file `code.py` will be executed.
123123

124-
Aftercode.pyhas finished executing, a REPL prompt will be presented on the serial port. Other files can also be executed by using the **Thonny** editors or using **Ampy** tool.
124+
After code.py has finished executing, a REPL prompt will be presented on the serial port. Other files can also be executed by using the **Thonny** editors or using **Ampy** tool.
125125

126126
![Thonny](./res/Thonny.png)
127127

128-
With the boards which support USB mass storage, we can drag the files to the board file system. However, because the EFR32 boards don’t support USB mass storage, we need to use a tool like **Ampy** to copy the file to the board. You can use the latest version of **Ampy** and itscommandto copy the module directories to the board.
128+
With the boards which support USB mass storage, we can drag the files to the board file system. However, because the EFR32 boards don’t support USB mass storage, we need to use a tool like **Ampy** to copy the file to the board. You can use the latest version of **Ampy** and its command to copy the module directories to the board.
129129

130130
Refer to the guide below for installing the **Ampy** tool:
131131

ports/silabs/license.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

ports/stm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Circuitpython on STM32 #
1+
# ST Microelectronics STM32 #
22

33
This port brings the ST Microelectronics STM32 series of MCUs to Circuitpython. STM32 chips have a wide range of capability, from <$1 low power STM32F0s to dual-core STM32H7s running at 400+ MHz. Currently, only the F4, F7, and H7 families are supported, powered by the ARM Cortex M4 and M7 processors.
44

ports/unix/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The Unix version
2-
----------------
2+
================
33

44
The "unix" port requires a standard Unix-like environment with gcc and GNU
55
make. This includes Linux, BSD, macOS, and Windows Subsystem for Linux. The
@@ -46,7 +46,7 @@ Browse available modules at [micropython-lib]
4646
for more information about `mip`.
4747

4848
External dependencies
49-
---------------------
49+
=====================
5050

5151
The `libffi` library and `pkg-config` tool are required. On Debian/Ubuntu/Mint
5252
derivative Linux distros, install `build-essential`(includes toolchain and

shared-bindings/support_matrix.rst

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ You can also type a regular expression as a filter.
1717

1818
<p id="support-matrix-filter-block"><input placeholder="Filter the boards by available modules" id="support-matrix-filter" type="text"/><span id="support-matrix-filter-num">(all)</span></p>
1919

20+
.. raw:: latex
21+
22+
\begin{landscape}
23+
2024
.. rst-class:: support-matrix-table
2125
.. list-table::
2226
:header-rows: 1
@@ -26,8 +30,10 @@ You can also type a regular expression as a filter.
2630
- Modules Available
2731

2832
{% for key, value in support_matrix|dictsort %}
29-
{{ '.. _' ~ key|replace(" ", "-") ~ ':' }}
3033
* - {{ key }}
34+
35+
{{ '.. _' ~ key|replace(" ", "-") ~ ':' }}
36+
3137
- {{ ':py:mod:`' ~ value.modules|join("`, :py:mod:`") ~ '`' }}
3238

3339
{% for module in value.frozen_libraries %}\
@@ -39,3 +45,7 @@ You can also type a regular expression as a filter.
3945
{% endfor %}
4046

4147
{% endfor %}
48+
49+
.. raw:: latex
50+
51+
\end{landscape}

0 commit comments

Comments
 (0)