Skip to content

Commit e76d2e4

Browse files
authored
Merge branch 'adafruit:main' into main
2 parents 739f74d + e80c92c commit e76d2e4

File tree

1,103 files changed

+144996
-124754
lines changed

Some content is hidden

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

1,103 files changed

+144996
-124754
lines changed

.codespell/exclude-file.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ i1Qb$TE"rl
88
ZEN = "the zen of python beautiful is better than ugly explicit is better than implicit simple is better than complex complex is better than complicated flat is better than nested sparse is better than dense readability counts special cases arent special enough to break the rules although practicality beats purity errors should never pass silently unless explicitly silenced in the face of ambiguity refuse the temptation to guess there should be one and preferably only one obvious way to do it although that way may not be obvious at first unless youre dutch now is better than never although never is often better than right now if the implementation is hard to explain its a bad idea if the implementation is easy to explain it may be a good idea namespaces are one honking great idea lets do more of those"
99
"arent",
1010
"youre",
11+
USB_MANUFACTURER = "Wee Noise Makers"

.codespell/ignore-words.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ ftbfs
2626
straightaway
2727
ftbs
2828
ftb
29+
curren

.devcontainer/cortex-m-toolchain.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ echo -e "[cortex-m-toolchain.sh] downloading and installing gcc-arm-non-eabi too
1414
cd /workspaces
1515

1616
wget -qO gcc-arm-none-eabi.tar.xz \
17-
https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
17+
https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
1818

1919
tar -xJf gcc-arm-none-eabi.tar.xz
20-
ln -s arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
20+
ln -s arm-gnu-toolchain-14.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
2121
rm -f gcc-arm-none-eabi.tar.xz
2222

2323
echo -e "[cortex-m-toolchain.sh] update PATH in environment"

.github/actions/deps/external/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ runs:
2727
uses: carlosperate/arm-none-eabi-gcc-action@v1
2828
with:
2929
# When changing this update what Windows grabs too!
30-
release: '13.2.Rel1'
30+
release: '14.2.Rel1'
3131

3232
# espressif
3333
- name: Get espressif toolchain

.github/actions/deps/ports/broadcom/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ runs:
55
steps:
66
- name: Get broadcom toolchain
77
run: |
8-
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
9-
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
8+
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
9+
sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
1010
sudo apt-get update
1111
sudo apt-get install -y mtools
1212
shell: bash

.github/actions/deps/ports/espressif/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ runs:
77
run: |
88
echo >> $GITHUB_ENV "IDF_PATH=$GITHUB_WORKSPACE/ports/espressif/esp-idf"
99
echo >> $GITHUB_ENV "IDF_TOOLS_PATH=$GITHUB_WORKSPACE/.idf_tools"
10+
echo >> $GITHUB_ENV "ESP_ROM_ELF_DIR=$GITHUB_WORKSPACE/.idf_tools"
1011
shell: bash
1112

1213
- name: Get IDF commit

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,9 @@ jobs:
261261
python3 -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
262262
- name: Install dependencies
263263
run: |
264-
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi.zip
265-
unzip -q -d /tmp gcc-arm.zip
266-
tar -C /tmp/arm-gnu-toolchain* -cf - . | tar -C /usr/local -xf -
264+
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-mingw-w64-i686-arm-none-eabi.zip
265+
unzip -q -d /tmp/arm-gnu-toolchain gcc-arm.zip
266+
tar -C /tmp/arm-gnu-toolchain -cf - . | tar -C /usr/local -xf -
267267
# We could use a venv instead, but that requires entering the venv on each run step
268268
# that runs in its own shell. There are some actions that help with that, but not for msys2
269269
# that I can find. (dhalbert)

.github/workflows/notify-on-issue-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
permissions:
1111
issues: write
1212
steps:
13-
- uses: tekktrik/issue-labeled-ping@v1
13+
- uses: tekktrik/issue-labeled-ping@v2
1414
with:
1515
github-token: ${{ secrets.GITHUB_TOKEN }}
1616
user: v923z

.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*.o
1010
*.a
1111
!atmel-samd/asf/**/*.a
12+
!ports/espressif/microros-lib/**/*.a
1213
*.elf
1314
*.bin
1415
!*.toml.bin
@@ -38,10 +39,12 @@ bin/
3839
circuitpython-stubs/
3940
test-stubs/
4041
build-*/
42+
docs/genrst/
4143

42-
# Test failure outputs
44+
# Test failure outputs and intermediate artifacts
4345
######################
4446
tests/results/*
47+
tests/ports/unix/ffi_lib.so
4548

4649
# Python cache files
4750
######################
@@ -75,6 +78,7 @@ TAGS
7578
####################
7679
*~
7780

81+
# MacOS desktop metadata files
7882
*.DS_Store
7983
**/*.DS_Store
8084
*.icloud
@@ -97,3 +101,9 @@ TAGS
97101
# clangd cache
98102
##############
99103
.cache
104+
105+
**/CLAUDE.local.md
106+
.claude
107+
108+
# windsurf rules
109+
.windsurfrules

.gitmodules

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
url = https://github.com/micropython/axtls.git
88
[submodule "lib/libffi"]
99
path = lib/libffi
10-
url = https://github.com/atgreen/libffi
10+
url = https://github.com/libffi/libffi
1111
[submodule "lib/berkeley-db-1.xx"]
1212
path = lib/berkeley-db-1.xx
1313
url = https://github.com/micropython/berkeley-db-1.xx
@@ -143,7 +143,7 @@
143143
[submodule "ports/espressif/esp-idf"]
144144
path = ports/espressif/esp-idf
145145
url = https://github.com/adafruit/esp-idf.git
146-
branch = circuitpython-v5.3.2
146+
branch = circuitpython-v5.4.1
147147
[submodule "ports/espressif/esp-protocols"]
148148
path = ports/espressif/esp-protocols
149149
url = https://github.com/adafruit/esp-protocols.git
@@ -172,7 +172,8 @@
172172
url = https://github.com/adafruit/Adafruit_CircuitPython_SimpleMath
173173
[submodule "ports/raspberrypi/sdk"]
174174
path = ports/raspberrypi/sdk
175-
url = https://github.com/raspberrypi/pico-sdk.git
175+
url = https://github.com/adafruit/pico-sdk.git
176+
branch = force_inline_critical_section_2.1.1
176177
[submodule "data/nvm.toml"]
177178
path = data/nvm.toml
178179
url = https://github.com/adafruit/nvm.toml.git
@@ -345,7 +346,7 @@
345346
url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
346347
[submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
347348
path = ports/raspberrypi/lib/Pico-PIO-USB
348-
url = https://github.com/adafruit/Pico-PIO-USB.git
349+
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
349350
branch = main
350351
[submodule "lib/micropython-lib"]
351352
path = lib/micropython-lib
@@ -411,3 +412,6 @@
411412
[submodule "ports/analog/msdk"]
412413
path = ports/analog/msdk
413414
url = https://github.com/analogdevicesinc/msdk.git
415+
[submodule "ports/espressif/microros-lib"]
416+
path = ports/espressif/microros-lib
417+
url = https://github.com/hierophect/microros-lib.git

0 commit comments

Comments
 (0)