Skip to content

Commit 2c0f9e9

Browse files
committed
Merge remote-tracking branch 'adafruit/main' into automount_sd
2 parents 0801f3c + 25216c8 commit 2c0f9e9

File tree

198 files changed

+2267
-769
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+2267
-769
lines changed

.github/pull_request_template.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Thanks for submitting a pull request to CircuitPython! Remove these instructions before submitting.
2+
3+
See https://learn.adafruit.com/contribute-to-circuitpython-with-git-and-github for detailed instructions.
4+
5+
- Consider whether to submit this PR against `main` or against (if it exists) the branch for the current stable release or an upcoming minor release. The branch will be named `i.j.x`, for example, `9.2.x`. Bug fixes and minor enhancements can be submitted against the stable release branch, and will be merged to `main` regularly.
6+
- Create your own fork of `circuitpython` and create a branch for your changes.
7+
- Use `pre-commit` to check your commits before submitting. See https://learn.adafruit.com/contribute-to-circuitpython-with-git-and-github/check-your-code.
8+
- Test your changes and tell us how you tested.
9+
10+
---

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@
345345
url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
346346
[submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
347347
path = ports/raspberrypi/lib/Pico-PIO-USB
348-
url = https://github.com/tannewt/Pico-PIO-USB.git
349-
branch = better_timeouts
348+
url = https://github.com/adafruit/Pico-PIO-USB.git
349+
branch = main
350350
[submodule "lib/micropython-lib"]
351351
path = lib/micropython-lib
352352
url = https://github.com/micropython/micropython-lib.git

.pre-commit-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ repos:
1010
hooks:
1111
- id: check-yaml
1212
- id: end-of-file-fixer
13-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/raspberrypi/sdk|lib/tinyusb)'
13+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/mimxrt10xx/sdk|ports/raspberrypi/sdk|lib/tinyusb)'
1414
- id: trailing-whitespace
15-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|lib/tinyusb)'
15+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|ports/mimxrt10xx/sdk|lib/tinyusb)'
1616
- repo: https://github.com/codespell-project/codespell
1717
rev: v2.2.4
1818
hooks:
@@ -59,3 +59,4 @@ repos:
5959
rev: "v2.5.0"
6060
hooks:
6161
- id: pyproject-fmt
62+
exclude: '^(ports/mimxrt10xx/sdk)'

docs/library/errno.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
|see_cpython_module| :mod:`python:errno`.
88

99
This module provides access to symbolic error codes for `OSError` exception.
10-
The codes available may vary per CircuitPython build.
10+
Some codes are not available on the smallest CircuitPython builds, such as SAMD21, for space reasons.
1111

1212
Constants
1313
---------

0 commit comments

Comments
 (0)