djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5959 from andypiper/patch-1 

Fix typos
This commit is contained in:
Dan Halbert 2022-02-01 18:27:31 -05:00 committed by GitHub
parent 8b10925fd9 4096bb28ab
commit 5435a40c54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ports/espressif/README.rst
View File

@ -19,24 +19,24 @@ How this port is organized:
- **bindings/** contains some required bindings to the ESP-IDF for exceptions and memory.
- **boards/** contains the configuration files for each development board and breakout available on the port.
- **common-hal/** contains the port-specific module implementations, used by shared-module and shared-bindings.
- **esp-idf/** contains the Espressif IoT development framework installation, including all the drivers for the port.
- **esp-idf/** contains the Espressif IoT Development Framework installation, including all the drivers for the port.
- **modules/** contains information specific to certain Espressif SoC based hardware modules, such as the pins used for flash and RAM on the WROVER and WROOM.
- **peripherals/** contains peripheral setup files and peripheral mapping information, sorted by family and sub-variant. Most files in this directory can be generated with the python scripts in **tools/**.
- **supervisor/** contains port-specific implementations of internal flash, serial and USB, as well as the **port.c** file, which initializes the port at startup.
- **tools/** includes useful python scripts for debugging and other purposes.
- **tools/** includes useful Python scripts for debugging and other purposes.
At the root level, refer to **mpconfigboard.h** and **mpconfigport.mk** for port specific settings and a list of enabled circuitpython modules.
At the root level, refer to **mpconfigboard.h** and **mpconfigport.mk** for port specific settings and a list of enabled CircuitPython modules.
Connecting to the ESP32-C3
---------------------------------------
**USB Connetion:**
**USB Connection:**
On ESP32-C3 REV3 chips, a USB Serial/JTAG Controller is available. Note: This USB connection cannot be used for a ``CIRCUITPY`` drive.
Depending on the board you have, the USB port may or may not be connected to native USB.
Following connections need to be made if native USB isn't available on USB port:
The following connections need to be made if native USB isn't available on the USB port:
.. csv-table::
:header: GPIO, USB
@ -50,9 +50,9 @@ Connect these pins using a `USB adapter <https://www.adafruit.com/product/4090>`
**UART Connection:**
A `USB to UART convertor <https://www.adafruit.com/product/3309>`_ can be used for connecting to ESP32-C3 to get serial console, REPL interface and flashing CircuitPython.
A `USB to UART convertor <https://www.adafruit.com/product/3309>`_ can be used for connecting to ESP32-C3 to get access to the serial console and REPL and for flashing CircuitPython.
Following connections need to be made in this case.
The following connections need to be made in this case:
.. csv-table::
:header: GPIO, UART
@ -69,11 +69,11 @@ This feature is not yet available and currently under development.
Connecting to the ESP32-S2
---------------------------------------
**USB Connetion:**
**USB Connection:**
Depending on the board you have, the USB port may or may not be connected to native USB.
Following connections need to be made if native USB isn't available on USB port:
The following connections need to be made if native USB isn't available on the USB port:
.. csv-table::
:header: GPIO, USB
@ -87,9 +87,9 @@ Connect these pins using a `USB adapter <https://www.adafruit.com/product/4090>`
**UART Connection:**
A `USB to UART convertor <https://www.adafruit.com/product/3309>`_ can be used for connecting to ESP32-S2 to get serial console and flashing CircuitPython.
A `USB to UART convertor <https://www.adafruit.com/product/3309>`_ can be used for connecting to ESP32-S2 to get access to the serial console and REPL and for flashing CircuitPython.
Following connections need to be made in this case:
The following connections need to be made in this case:
.. csv-table::
:header: GPIO, UART
@ -106,11 +106,11 @@ This feature isn't available on ESP32-S2.
Connecting to the ESP32-S3
---------------------------------------
**USB Connetion:**
**USB Connection:**
Depending on the board you have, the USB port may or may not be connected to native USB.
Following connections need to be made if native USB isn't available on USB port:
The following connections need to be made if native USB isn't available on the USB port:
.. csv-table::
:header: GPIO, USB
@ -124,9 +124,9 @@ Connect these pins using a `USB adapter <https://www.adafruit.com/product/4090>`
**UART Connection:**
A `USB to UART convertor <https://www.adafruit.com/product/3309>`_ can be used for connecting to ESP32-S3 to get serial console and flashing CircuitPython.
A `USB to UART convertor <https://www.adafruit.com/product/3309>`_ can be used for connecting to ESP32-S3 to get access to the serial console and REPL and for flashing CircuitPython.
Following connections need to be made in this case:
The following connections need to be made in this case:
.. csv-table::
:header: GPIO, UART
@ -143,9 +143,9 @@ This feature is not yet available and currently under development.
Building and flashing
---------------------------------------
Before building or flashing the, you must `install the esp-idf <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/index.html>`_.
Before building or flashing the, you must `install the ESP-IDF <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/index.html>`_.
Note: This must be re-done every time the esp-idf is updated, but not every time you build.
Note: This must be re-done every time the ESP-IDF is updated, but not every time you build.
Run ``cd ports/espressif`` from ``circuitpython/`` to move to the espressif port root, and run:
@ -153,17 +153,17 @@ Run ``cd ports/espressif`` from ``circuitpython/`` to move to the espressif port
./esp-idf/install.sh
After this initial installation, you must add the esp-idf tools to your path.
After this initial installation, you must add the ESP-IDF tools to your path.
Note: This must be re-done every time you open a new bash environment for building or flashing.
Note: This must be re-done every time you open a new shell environment for building or flashing.
Run ``cd ports/espressif`` from ``circuitpython/`` to move to the espressif port root, and run:
.. code-block::
. esp-idf/export.sh
./esp-idf/export.sh
When CircuitPython updates the ESP-IDF to a new release, you may need to run this installation process again. The exact commands used may also vary based on your bash environment.
When CircuitPython updates the ESP-IDF to a new release, you may need to run this installation process again. The exact commands used may also vary based on your shell environment.
Building boards is typically done through ``make BOARD=board_id``. The default port is ``tty.SLAB_USBtoUART``, which will only work on certain Mac setups. On most machines, both Mac and Linux, you will need to set the port yourself by running ``ls /dev/tty.usb*`` and selecting the one that only appears when your development board is plugged in. An example make command with the port setting is as follows:
@ -171,7 +171,7 @@ Building boards is typically done through ``make BOARD=board_id``. The default p
make BOARD=board_id PORT=/dev/tty.usbserial-1421120 flash
``board_id`` is the unique board identifier in CircuitPython. It is the same as the name of board in ``boards`` directory.
``board_id`` is the unique board identifier in CircuitPython. It is the same as the name of the board in the ``boards`` directory.
Debugging
---------------------------------------
@ -180,11 +180,11 @@ TODO: Add documentation for ESP32-C3/S3 JTAG feature.
The ESP32-S2 supports JTAG debugging over OpenOCD using a JLink or other probe hardware. The official tutorials can be found on the Espressif website `here <https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-guides/jtag-debugging/index.html>`_, but they are mostly for the ESP32-S2 Kaluga, which has built-in debugging.
OpenOCD is automatically installed and added to your bash environment during the esp-idf installation and setup process. You can double check that it is installed by using ``openocd --version``, as per the tutorial. Attach the JTAG probe pins according to the `instructions for JTAG debugging <https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-guides/jtag-debugging/configure-other-jtag.html>`_ on boards that do not contain an integrated debugger.
OpenOCD is automatically installed and added to your bash environment during the ESP-IDF installation and setup process. You can double check that it is installed by using ``openocd --version``, as per the tutorial. Attach the JTAG probe pins according to the `instructions for JTAG debugging <https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-guides/jtag-debugging/configure-other-jtag.html>`_ on boards that do not contain an integrated debugger.
Once the debugger is connected physically, you must run OpenOCD with attached configuration files specifying the **interface** (your debugger probe) and either a **target** or a **board** (targets are for SoCs only, and can be used when a full board configuration file doesn't exist). You can find the path location of these files by checking the ``OPENOCD_SCRIPTS`` environmental variable by running ``echo $OPENOCD_SCRIPTS`` in bash. Interfaces will be in the ``interface/`` directory, and targets and boards in the ``target/`` and ``board/`` directories, respectively.
Once the debugger is connected physically, you must run OpenOCD with attached configuration files specifying the **interface** (your debugger probe) and either a **target** or a **board** (targets are for SoCs only, and can be used when a full board configuration file doesn't exist). You can find the location of these files by checking the ``OPENOCD_SCRIPTS`` environmental variable by running ``echo $OPENOCD_SCRIPTS``. Interfaces will be in the ``interface/`` directory, and targets and boards in the ``target/`` and ``board/`` directories, respectively.
**Note:** Unfortunately, there are no board files for the esp32-s2 other than the Kaluga, and the included ``target/esp32s2.cfg`` target file will not work by default on the Jlink for boards like the Saola 1, as the default speed is incorrect. In addition, these files are covered under the GPL and cannot be included in CircuitPython. Thus, you must make a copy of the esp32s2.cfg file yourself and add the following line manually, under ``transport select jtag`` at the start of the file:
**Note:** Unfortunately, there are no board files for the esp32-s2 other than the Kaluga, and the included ``target/esp32s2.cfg`` target file will not work by default on the JLink for boards like the Saola 1, as the default speed is incorrect. In addition, these files are covered under the GPL and cannot be included in CircuitPython. Thus, you must make a copy of the ``esp32s2.cfg`` file yourself and add the following line manually, under ``transport select jtag`` at the start of the file:
.. code-block::
@ -196,7 +196,7 @@ Once this is complete, your final OpenOCD command may look something like this:
openocd -f interface/jlink.cfg -f SOMEPATH/copied-esp32s2-saola-1.cfg
Where ``SOMEPATH`` is the location of your copied configuration file (this can be placed in the port/boards directory with a prefix to ignore it with ``.gitignore``, for instance). Interface, target and board config files sourced from espressif only need their paths from the $OPENOCD_SCRIPTS location, you don't need to include their full path. Once OpenOCD is running, connect to GDB with:
Where ``SOMEPATH`` is the location of your copied configuration file (this can be placed in the ``port/boards`` directory with a prefix to ignore it with ``.gitignore``, for instance). Interface, target and board config files sourced from Espressif only need their paths from the $OPENOCD_SCRIPTS location, you don't need to include their full path. Once OpenOCD is running, connect to GDB with:
.. code-block::