Skip to content

Commit da96882

Browse files
flom84flom84
authored
Merge branch 'adafruit:main' into main
2 parents eca9393 + 9ff384a commit da96882

File tree

460 files changed

+9245
-2999
lines changed

Some content is hidden

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

460 files changed

+9245
-2999
lines changed

‎.codespell/exclude-file.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#define MICROPY_HW_BOARD_NAME "BLOK"
2+
USB_PRODUCT = "BLOK"
3+
uint32_t THI = (*(uint32_t *)FUSES_HOT_TEMP_VAL_INT_ADDR & FUSES_HOT_TEMP_VAL_INT_Msk) >> FUSES_HOT_TEMP_VAL_INT_Pos;
4+
float TH = THI + convert_dec_to_frac(THD);
5+
print(binascii.b2a_base64(b"fo"))
6+
# again, neither will "there" or "wither", since they have "the"
7+
i1Qb$TE"rl

‎.codespell/ignore-words.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
ans
2+
ure
3+
clen
4+
ser
5+
endianess
6+
pris
7+
synopsys
8+
reenable
9+
dout
10+
inout
11+
wel
12+
iput
13+
hsi
14+
astroid
15+
busses
16+
cyphertext
17+
dum
18+
deque
19+
deques
20+
extint
21+
shs
22+
pass-thru

‎.codespellrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# See: https://github.com/codespell-project/codespell#using-a-config-file
2+
[codespell]
3+
# In the event of a false positive, add the problematic word, in all lowercase, to 'ignore-words.txt' (one word per line).
4+
# Or copy & paste the whole problematic line to 'exclude-file.txt'
5+
ignore-words = .codespell/ignore-words.txt
6+
exclude-file = .codespell/exclude-file.txt
7+
check-filenames =
8+
check-hidden =
9+
count =
10+
skip = .cproject,.git,./lib,./locale,ACKNOWLEDGEMENTS

‎.github/workflows/build.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,9 @@ jobs:
6767
run: echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
6868
- name: Set base sha (pull)
6969
if: github.event_name == 'pull_request'
70-
run: |
71-
git fetch --no-tags --no-recurse-submodules --depth=$((DEPTH + 1)) origin $HEAD_SHA
72-
echo "BASE_SHA=$(git rev-list $HEAD_SHA --skip=$DEPTH --max-count=1)" >> $GITHUB_ENV
70+
run: git cat-file -e $SHA && echo "BASE_SHA=$SHA" >> $GITHUB_ENV || true
7371
env:
74-
DEPTH: ${{ steps.get-last-commit-with-checks.outputs.commit_depth || github.event.pull_request.commits }}
72+
SHA: ${{ steps.get-last-commit-with-checks.outputs.commit_sha || github.event.pull_request.base.sha }}
7573
- name: Set head sha (push)
7674
if: github.event_name == 'push'
7775
run: echo "HEAD_SHA=${{ github.event.after }}" >> $GITHUB_ENV
@@ -80,16 +78,11 @@ jobs:
8078
run: git cat-file -e $SHA && echo "BASE_SHA=$SHA" >> $GITHUB_ENV || true
8179
env:
8280
SHA: ${{ github.event.before }}
83-
- name: Get changes
84-
id: get-changes
85-
if: env.BASE_SHA && env.HEAD_SHA
86-
run: echo $(git diff $BASE_SHA...$HEAD_SHA --name-only) | echo "changed_files=[\"$(sed "s/ /\", \"/g")\"]" >> $GITHUB_OUTPUT
8781
- name: Set matrix
8882
id: set-matrix
8983
run: python3 -u ci_set_matrix.py
9084
working-directory: tools
9185
env:
92-
CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
9386
LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}
9487

9588
tests:

‎.gitmodules

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
path = ports/atmel-samd/asf4
3434
url = https://github.com/adafruit/asf4.git
3535
branch = circuitpython
36-
[submodule "tools/usb_descriptor"]
37-
path = tools/usb_descriptor
38-
url = https://github.com/adafruit/usb_descriptor.git
3936
[submodule "lib/nrfutil"]
4037
path = lib/nrfutil
4138
url = https://github.com/adafruit/nRF52_nrfutil
@@ -103,7 +100,7 @@
103100
url = https://github.com/adafruit/Adafruit_MP3
104101
[submodule "ports/mimxrt10xx/sdk"]
105102
path = ports/mimxrt10xx/sdk
106-
url = https://github.com/adafruit/MIMXRT10xx_SDK
103+
url = https://github.com/nxp-mcuxpresso/mcux-sdk.git
107104
[submodule "frozen/Adafruit_CircuitPython_Register"]
108105
path = frozen/Adafruit_CircuitPython_Register
109106
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git

‎.pre-commit-config.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,19 @@ repos:
88
hooks:
99
- id: check-yaml
1010
- id: end-of-file-fixer
11-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
11+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
1212
- id: trailing-whitespace
13-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
13+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff)'
14+
- repo: https://github.com/codespell-project/codespell
15+
rev: v2.2.4
16+
hooks:
17+
- id: codespell
18+
args: [-w]
19+
exclude: |
20+
(?x)^(
21+
locale/|
22+
lib/
23+
)
1424
- repo: local
1525
hooks:
1626
- id: translations

‎.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build:
1414
python: "3"
1515
jobs:
1616
post_install:
17-
- python tools/ci_fetch_deps.py build-doc
17+
- python tools/ci_fetch_deps.py docs
1818

1919
formats:
2020
- pdf

‎CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ accordingly.
123123

124124
## Attribution
125125

126-
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
126+
This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org),
127127
version 1.4, available at
128128
<https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>,
129129
and the [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html).

‎Makefile

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,24 @@ clean-stm:
324324
$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
325325

326326

327-
# This update will fail because the commits we need aren't the latest on the
328-
# branch. We can ignore that though because we fix it with the second command.
327+
# If available, do blobless partial clones of submodules to save time and space.
328+
# A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.)
329+
# so it does not have the idiosyncrasies of a shallow clone.
330+
#
331+
# If not available, do a fetch that will fail, and then fix it up with a second fetch.
329332
# (Only works for git servers that allow sha fetches.)
330333
.PHONY: fetch-submodules
331334
fetch-submodules:
332-
git submodule update --init -N --depth 1 || true
333-
git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1'
335+
git submodule sync
336+
#####################################################################################
337+
# NOTE: Ideally, use git version 2.36.0 or later, to do partial clones of submodules.
338+
# If an older git is used, submodules will be cloned with a shallow clone of depth 1.
339+
# You will see a git usage message first if the git version is too old to do
340+
# clones of submodules.
341+
#####################################################################################
342+
git submodule update --init --filter=blob:none || git submodule update --init -N --depth 1 || git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1' || echo 'make fetch-submodules FAILED'
343+
344+
.PHONY: remove-submodules
345+
remove-submodules:
346+
git submodule deinit -f --all
347+
rm -rf .git/modules/*

‎conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
extensions = [
7878
'sphinx.ext.autodoc',
7979
'sphinx.ext.doctest',
80+
"sphinxcontrib.jquery",
8081
'sphinxcontrib.rsvgconverter',
8182
'sphinx.ext.intersphinx',
8283
'sphinx.ext.todo',

0 commit comments

Comments
 (0)