Skip to content

Commit 03da934

Browse files
committed
Merge remote-tracking branch 'adafruit/main' into development
2 parents d78a9c7 + 1a6c2b9 commit 03da934

File tree

1,006 files changed

+22730
-8583
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,006 files changed

+22730
-8583
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/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
9-
sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-13.3.rel1-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/actions/deps/ports/nordic/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
steps:
66
- name: Get nrfutil 7+
77
run: |
8-
wget https://developer.nordicsemi.com/.pc-tools/nrfutil/x64-linux/nrfutil
8+
wget https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/executables/x86_64-unknown-linux-gnu/nrfutil
99
chmod +x nrfutil
1010
./nrfutil install nrf5sdk-tools
1111
mkdir -p $HOME/.local/bin

.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/bundle_cron.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-FileCopyrightText: 2019 Michael Schroeder
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
name: Update Bundles
6+
7+
on:
8+
schedule:
9+
- cron: 0 5 * * *
10+
workflow_dispatch:
11+
12+
jobs:
13+
check-repo-owner:
14+
# This job is so the entire workflow will end successfully and give some
15+
# output to explain why it hasn't run on a non-Adafruit fork.
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: repository
19+
env:
20+
OWNER_IS_ADAFRUIT: ${{ startswith(github.repository, 'adafruit/') }}
21+
run: |
22+
echo "This workflow will only run if Adafruit is the repository owner."
23+
echo "Repository owner is Adafruit: $OWNER_IS_ADAFRUIT"
24+
update-bundles:
25+
runs-on: ubuntu-latest
26+
# Only run the build on Adafruit's repository. Forks won't have the secrets.
27+
# It's necessary to do this here, since 'schedule' events cannot (currently)
28+
# be limited (they run on all forks' default branches).
29+
if: startswith(github.repository, 'adafruit/')
30+
steps:
31+
- name: Set up Python 3.12
32+
uses: actions/setup-python@v5
33+
with:
34+
python-version: 3.12
35+
- name: Load contributor cache
36+
uses: actions/cache@v4
37+
with:
38+
key: "contributor-cache"
39+
path: "contributors.json"
40+
- name: Versions
41+
run: |
42+
python3 --version
43+
- uses: actions/checkout@v4
44+
with:
45+
repository: 'adafruit/adabot'
46+
submodules: true
47+
- name: Install deps
48+
run: |
49+
pip install -r requirements.txt
50+
- name: Run adabot.circuitpython_bundle
51+
env:
52+
ADABOT_EMAIL: ${{ secrets.ADABOT_EMAIL }}
53+
ADABOT_GITHUB_USER: ${{ secrets.ADABOT_GITHUB_USER }}
54+
ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.ADABOT_GITHUB_ACCESS_TOKEN }}
55+
BIGQUERY_PRIVATE_KEY: ${{ secrets.BIGQUERY_PRIVATE_KEY }}
56+
BIGQUERY_CLIENT_EMAIL: ${{ secrets.BIGQUERY_CLIENT_EMAIL }}
57+
run: |
58+
python3 -u -m adabot.circuitpython_bundle

.github/workflows/learn_cron.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# SPDX-FileCopyrightText: 2021 Jeff Epler for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
name: Tag Learning System Guides
6+
7+
on:
8+
schedule:
9+
- cron: 0 5 * * *
10+
11+
jobs:
12+
check-repo-owner:
13+
# This job is so the entire workflow will end successfully and give some
14+
# output to explain why it hasn't run on a non-Adafruit fork.
15+
runs-on: ubuntu-latest
16+
if: ${{ (github.repository_owner != 'adafruit') }}
17+
steps:
18+
- run: |
19+
echo "This workflow is only intended to run in the adafruit fork"
20+
21+
update-learn:
22+
runs-on: ubuntu-latest
23+
# Only run the build if the access token has been configured. This will be
24+
# the case on Adafruit's repository. It's necessary to do this here, since
25+
# 'schedule' events cannot (currently) be limited (they run on all forks'
26+
# default branches).
27+
if: ${{ (github.repository_owner == 'adafruit') }}
28+
steps:
29+
- uses: actions/checkout@v4
30+
with:
31+
repository: ${{ github.repository_owner }}/Adafruit_Learning_System_Guides
32+
token: ${{ secrets.ADABOT_GITHUB_ACCESS_TOKEN }}
33+
- name: Tag a release
34+
env:
35+
ADABOT_EMAIL: ${{ secrets.ADABOT_EMAIL }}
36+
run: |
37+
git config --global user.name adabot
38+
git config --global user.email "$ADABOT_EMAIL"
39+
TAG_NAME=`date +%Y%m%d`
40+
git tag $TAG_NAME
41+
git push origin $TAG_NAME

0 commit comments

Comments
 (0)