Skip to content

Commit 14ecc44

Browse files
committed
Merge branch 'main' into m5stack_core2
2 parents e5a5a34 + 4e25a4f commit 14ecc44

File tree

130 files changed

+9492
-204
lines changed

Some content is hidden

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

130 files changed

+9492
-204
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ runs:
3030
# espressif
3131
- name: Get espressif toolchain
3232
if: inputs.port == 'espressif'
33-
run: sudo apt-get install -y ninja-build
33+
run: |
34+
sudo apt-get update
35+
sudo apt-get install -y ninja-build
3436
shell: bash
3537
- name: Install IDF tools
3638
if: inputs.port == 'espressif'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ runs:
77
run: |
88
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
99
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
10+
sudo apt-get update
1011
sudo apt-get install -y mtools
1112
shell: bash
1213
- name: Install mkfs.fat

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ jobs:
174174
uses: ./.github/actions/deps/submodules
175175
- name: Install dependencies
176176
run: |
177+
sudo apt-get update
177178
sudo apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
178179
pip install -r requirements-doc.txt
179180
- name: Build and Validate Stubs

.github/workflows/pre-commit.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
- name: Set up external
3131
uses: ./.github/actions/deps/external
3232
- name: Install dependencies
33-
run: sudo apt-get install -y gettext uncrustify
33+
run: |
34+
sudo apt-get update
35+
sudo apt-get install -y gettext uncrustify
3436
- name: Run pre-commit
3537
uses: pre-commit/[email protected]
3638
- name: Make patch

.gitmodules

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,3 +324,10 @@
324324
path = ports/broadcom/peripherals
325325
url = https://github.com/adafruit/broadcom-peripherals.git
326326
branch = main-build
327+
[submodule "ports/silabs/gecko_sdk"]
328+
path = ports/silabs/gecko_sdk
329+
url = https://github.com/SiliconLabs/gecko_sdk.git
330+
branch = v4.2.1
331+
[submodule "ports/silabs/tools/slc_cli_linux"]
332+
path = ports/silabs/tools/slc_cli_linux
333+
url = https://github.com/SiliconLabs/circuitpython_slc_cli_linux

conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ def autoapi_prepare_jinja_env(jinja_env):
216216
"ports/nrf/usb",
217217
"ports/raspberrypi/sdk",
218218
"ports/raspberrypi/lib",
219+
"ports/silabs",
219220
"ports/stm/st_driver",
220221
"ports/stm/packages",
221222
"ports/stm/peripherals",

data/nvm.toml

docs/shared_bindings_matrix.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"mimxrt10xx",
4141
"nrf",
4242
"raspberrypi",
43+
"silabs",
4344
"stm",
4445
]
4546

0 commit comments

Comments
 (0)