Skip to content

Commit 19f1119

Browse files
FoamyGuyFoamyGuy
committed
Merge branch 'main' into fastpixelmap
# Conflicts: # shared-module/adafruit_pixelbuf/PixelBuf.c
2 parents f5c637d + c12e2a1 commit 19f1119

File tree

107 files changed

+3235
-354
lines changed

Some content is hidden

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

107 files changed

+3235
-354
lines changed

‎.github/workflows/build.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,30 @@ jobs:
125125
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
126126
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
127127
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1
128-
- name: "Get changes"
128+
- name: Get last commit with checks
129+
id: get-last-commit-with-checks
129130
if: github.event_name == 'pull_request'
130-
uses: dorny/paths-filter@v2
131-
id: filter
132-
with:
133-
list-files: json
134-
filters: |
135-
changed:
136-
- '**'
137-
- name: "Set matrix"
131+
working-directory: tools
132+
env:
133+
REPO: ${{ github.repository }}
134+
PULL: ${{ github.event.number }}
135+
GITHUB_TOKEN: ${{ github.token }}
136+
EXCLUDE_COMMIT: ${{ github.event.after }}
137+
run: python3 -u ci_changes_per_commit.py
138+
- name: Get changes
139+
id: get-changes
140+
if: github.event_name == 'pull_request'
141+
uses: tj-actions/changed-files@v34
142+
with:
143+
json: true
144+
sha: ${{ steps.get-last-commit-with-checks.outputs.commit && github.event.after }}
145+
base_sha: ${{ steps.get-last-commit-with-checks.outputs.commit }}
146+
- name: Set matrix
138147
id: set-matrix
139148
working-directory: tools
140149
env:
141-
CHANGED_FILES: ${{ steps.filter.outputs.changed_files }}
150+
CHANGED_FILES: ${{ steps.get-changes.outputs.all_changed_and_modified_files }}
151+
LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.checkruns }}
142152
run: python3 -u ci_set_matrix.py
143153

144154

‎.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,3 +319,9 @@
319319
[submodule "lib/mbedtls"]
320320
path = lib/mbedtls
321321
url = https://github.com/ARMmbed/mbedtls.git
322+
[submodule "frozen/Adafruit_CircuitPython_UC8151D"]
323+
path = frozen/Adafruit_CircuitPython_UC8151D
324+
url = https://github.com/adafruit/Adafruit_CircuitPython_UC8151D
325+
[submodule "frozen/Adafruit_CircuitPython_SSD1680"]
326+
path = frozen/Adafruit_CircuitPython_SSD1680
327+
url = https://github.com/adafruit/Adafruit_CircuitPython_SSD1680

‎extmod/ulab

‎frozen/Adafruit_CircuitPython_LIS3DH

‎frozen/Adafruit_CircuitPython_Requests

‎frozen/Adafruit_CircuitPython_SSD1680

‎frozen/Adafruit_CircuitPython_UC8151D

‎lib/protomatter

‎locale/ID.po

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3730,10 +3730,20 @@ msgid "offset out of bounds"
37303730
msgstr "modul tidak ditemukan"
37313731

37323732
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3733+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37333734
msgid "only bit_depth=16 is supported"
37343735
msgstr ""
37353736

3737+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3738+
msgid "only mono is supported"
3739+
msgstr ""
3740+
3741+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3742+
msgid "only oversample=64 is supported"
3743+
msgstr ""
3744+
37363745
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3746+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37373747
msgid "only sample_rate=16000 is supported"
37383748
msgstr ""
37393749

‎locale/circuitpython.pot

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3707,10 +3707,20 @@ msgid "offset out of bounds"
37073707
msgstr ""
37083708

37093709
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3710+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37103711
msgid "only bit_depth=16 is supported"
37113712
msgstr ""
37123713

3714+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3715+
msgid "only mono is supported"
3716+
msgstr ""
3717+
3718+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3719+
msgid "only oversample=64 is supported"
3720+
msgstr ""
3721+
37133722
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3723+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37143724
msgid "only sample_rate=16000 is supported"
37153725
msgstr ""
37163726

‎locale/cs.po

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3716,10 +3716,20 @@ msgid "offset out of bounds"
37163716
msgstr ""
37173717

37183718
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3719+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37193720
msgid "only bit_depth=16 is supported"
37203721
msgstr ""
37213722

3723+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3724+
msgid "only mono is supported"
3725+
msgstr ""
3726+
3727+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3728+
msgid "only oversample=64 is supported"
3729+
msgstr ""
3730+
37223731
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3732+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37233733
msgid "only sample_rate=16000 is supported"
37243734
msgstr ""
37253735

0 commit comments

Comments
 (0)