Skip to content

Commit 8f4dad8

Browse files
bwshockleybwshockley
authored
Merge branch 'adafruit:main' into master
2 parents 21857ed + bca7d6e commit 8f4dad8

Some content is hidden

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

59 files changed

+1868
-447
lines changed

‎.github/workflows/build.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ on:
99
pull_request:
1010
release:
1111
types: [published]
12-
check_suite:
13-
types: [rerequested]
1412

1513
concurrency:
1614
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -64,24 +62,32 @@ jobs:
6462
PULL: ${{ github.event.number }}
6563
GITHUB_TOKEN: ${{ github.token }}
6664
EXCLUDE_COMMIT: ${{ github.event.pull_request.head.sha }}
67-
- name: Set head sha
65+
- name: Set head sha (pull)
6866
if: github.event_name == 'pull_request'
6967
run: echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
70-
- name: Set base sha
68+
- name: Set base sha (pull)
7169
if: github.event_name == 'pull_request'
7270
run: |
7371
git fetch --no-tags --no-recurse-submodules --depth=$((DEPTH + 1)) origin $HEAD_SHA
7472
echo "BASE_SHA=$(git rev-list $HEAD_SHA --skip=$DEPTH --max-count=1)" >> $GITHUB_ENV
7573
env:
7674
DEPTH: ${{ steps.get-last-commit-with-checks.outputs.commit_depth || github.event.pull_request.commits }}
75+
- name: Set head sha (push)
76+
if: github.event_name == 'push'
77+
run: echo "HEAD_SHA=${{ github.event.after }}" >> $GITHUB_ENV
78+
- name: Set base sha (push)
79+
if: github.event_name == 'push'
80+
run: git cat-file -e $SHA && echo "BASE_SHA=$SHA" >> $GITHUB_ENV || true
81+
env:
82+
SHA: ${{ github.event.before }}
7783
- name: Get changes
7884
id: get-changes
79-
if: github.event_name == 'pull_request'
85+
if: env.BASE_SHA && env.HEAD_SHA
8086
run: echo $(git diff $BASE_SHA...$HEAD_SHA --name-only) | echo "changed_files=[\"$(sed "s/ /\", \"/g")\"]" >> $GITHUB_OUTPUT
8187
- name: Set matrix
8288
id: set-matrix
83-
working-directory: tools
8489
run: python3 -u ci_set_matrix.py
90+
working-directory: tools
8591
env:
8692
CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
8793
LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}

‎.github/workflows/create-website-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Update CircuitPython.org
66

77
on:
88
release:
9-
types: [published, rerequested]
9+
types: [published]
1010

1111
jobs:
1212
website:

‎.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
name: pre-commit
66

77
on:
8-
pull_request:
98
push:
9+
pull_request:
1010

1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

‎BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Pre-commit also requires some additional programs to be installed through your p
109109

110110
* Standard Unix tools such as make, find, etc
111111
* The gettext package, any modern version
112-
* uncrustify version 0.71 (0.72 is also tested)
112+
* uncrustify version 0.71 (0.72 is also tested and OK; 0.75 is not OK)
113113

114114
Each time you create a git commit, the pre-commit quality checks will be run. You can also run them e.g., with `pre-commit run foo.c` or `pre-commit run --all` to run on all files whether modified or not.
115115

‎locale/ID.po

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ msgstr "%q indeks di luar batas"
147147
msgid "%q init failed"
148148
msgstr ""
149149

150-
#: shared-bindings/dualbank/__init__.c
150+
#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
151151
msgid "%q is %q"
152152
msgstr ""
153153

@@ -245,7 +245,7 @@ msgstr "%q, %q, dan %q semuanya harus memiliki panjang yang sama"
245245
msgid "%q=%q"
246246
msgstr ""
247247

248-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
248+
#: ports/espressif/common-hal/espidf/__init__.c
249249
#, c-format
250250
msgid "%s error 0x%x"
251251
msgstr "%s kesalahan 0x%x"
@@ -513,6 +513,7 @@ msgstr "Sudah disebarkan."
513513
msgid "Already have all-matches listener"
514514
msgstr ""
515515

516+
#: ports/espressif/bindings/espnow/ESPNow.c
516517
#: ports/espressif/common-hal/espulp/ULP.c
517518
#: shared-module/memorymonitor/AllocationAlarm.c
518519
#: shared-module/memorymonitor/AllocationSize.c
@@ -686,7 +687,7 @@ msgstr "Blok CBC harus merupakan kelipatan 16 byte"
686687
msgid "CIRCUITPY drive could not be found or created."
687688
msgstr ""
688689

689-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
690+
#: ports/espressif/common-hal/espidf/__init__.c
690691
msgid "CRC or checksum was invalid"
691692
msgstr ""
692693

@@ -1082,7 +1083,7 @@ msgstr "Fungsinya membutuhkan kunci"
10821083
msgid "GNSS init"
10831084
msgstr ""
10841085

1085-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1086+
#: ports/espressif/common-hal/espidf/__init__.c
10861087
msgid "Generic Failure"
10871088
msgstr ""
10881089

@@ -1267,8 +1268,7 @@ msgstr ""
12671268
msgid "Invalid MAC address"
12681269
msgstr ""
12691270

1270-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1271-
#: py/moduerrno.c
1271+
#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
12721272
msgid "Invalid argument"
12731273
msgstr "Argumen tidak valid"
12741274

@@ -1294,7 +1294,7 @@ msgstr "Ukuran potongan format tidak valid"
12941294
msgid "Invalid multicast MAC address"
12951295
msgstr ""
12961296

1297-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1297+
#: ports/espressif/common-hal/espidf/__init__.c
12981298
msgid "Invalid size"
12991299
msgstr ""
13001300

@@ -1303,7 +1303,7 @@ msgstr ""
13031303
msgid "Invalid socket for TLS"
13041304
msgstr ""
13051305

1306-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1306+
#: ports/espressif/common-hal/espidf/__init__.c
13071307
msgid "Invalid state"
13081308
msgstr ""
13091309

@@ -1335,7 +1335,7 @@ msgstr ""
13351335
msgid "Layer must be a Group or TileGrid subclass"
13361336
msgstr ""
13371337

1338-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1338+
#: ports/espressif/common-hal/espidf/__init__.c
13391339
msgid "MAC address was invalid"
13401340
msgstr ""
13411341

@@ -1696,19 +1696,19 @@ msgstr ""
16961696
msgid "Operation not permitted"
16971697
msgstr ""
16981698

1699-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1699+
#: ports/espressif/common-hal/espidf/__init__.c
17001700
msgid "Operation or feature not supported"
17011701
msgstr ""
17021702

1703-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1703+
#: ports/espressif/common-hal/espidf/__init__.c
17041704
msgid "Operation timed out"
17051705
msgstr "Waktu habis"
17061706

17071707
#: ports/raspberrypi/common-hal/mdns/Server.c
17081708
msgid "Out of MDNS service slots"
17091709
msgstr ""
17101710

1711-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1711+
#: ports/espressif/common-hal/espidf/__init__.c
17121712
msgid "Out of memory"
17131713
msgstr "Kehabisan memori"
17141714

@@ -1891,7 +1891,7 @@ msgstr "Baca-saja"
18911891
msgid "Read-only filesystem"
18921892
msgstr "sistem file (filesystem) bersifat Read-only"
18931893

1894-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1894+
#: ports/espressif/common-hal/espidf/__init__.c
18951895
msgid "Received response was invalid"
18961896
msgstr ""
18971897

@@ -1911,7 +1911,7 @@ msgstr ""
19111911
msgid "Requested AES mode is unsupported"
19121912
msgstr "Mode AES yang diminta tidak didukung"
19131913

1914-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1914+
#: ports/espressif/common-hal/espidf/__init__.c
19151915
msgid "Requested resource not found"
19161916
msgstr ""
19171917

@@ -2366,7 +2366,7 @@ msgstr "Panjang nilai != Panjang tetap yang dibutuhkan"
23662366
msgid "Value length > max_length"
23672367
msgstr "Panjang nilai > max_length"
23682368

2369-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
2369+
#: ports/espressif/common-hal/espidf/__init__.c
23702370
msgid "Version was invalid"
23712371
msgstr ""
23722372

‎locale/circuitpython.pot

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ msgstr ""
144144
msgid "%q init failed"
145145
msgstr ""
146146

147-
#: shared-bindings/dualbank/__init__.c
147+
#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
148148
msgid "%q is %q"
149149
msgstr ""
150150

@@ -242,7 +242,7 @@ msgstr ""
242242
msgid "%q=%q"
243243
msgstr ""
244244

245-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
245+
#: ports/espressif/common-hal/espidf/__init__.c
246246
#, c-format
247247
msgid "%s error 0x%x"
248248
msgstr ""
@@ -510,6 +510,7 @@ msgstr ""
510510
msgid "Already have all-matches listener"
511511
msgstr ""
512512

513+
#: ports/espressif/bindings/espnow/ESPNow.c
513514
#: ports/espressif/common-hal/espulp/ULP.c
514515
#: shared-module/memorymonitor/AllocationAlarm.c
515516
#: shared-module/memorymonitor/AllocationSize.c
@@ -681,7 +682,7 @@ msgstr ""
681682
msgid "CIRCUITPY drive could not be found or created."
682683
msgstr ""
683684

684-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
685+
#: ports/espressif/common-hal/espidf/__init__.c
685686
msgid "CRC or checksum was invalid"
686687
msgstr ""
687688

@@ -1072,7 +1073,7 @@ msgstr ""
10721073
msgid "GNSS init"
10731074
msgstr ""
10741075

1075-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1076+
#: ports/espressif/common-hal/espidf/__init__.c
10761077
msgid "Generic Failure"
10771078
msgstr ""
10781079

@@ -1255,8 +1256,7 @@ msgstr ""
12551256
msgid "Invalid MAC address"
12561257
msgstr ""
12571258

1258-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1259-
#: py/moduerrno.c
1259+
#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
12601260
msgid "Invalid argument"
12611261
msgstr ""
12621262

@@ -1282,7 +1282,7 @@ msgstr ""
12821282
msgid "Invalid multicast MAC address"
12831283
msgstr ""
12841284

1285-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1285+
#: ports/espressif/common-hal/espidf/__init__.c
12861286
msgid "Invalid size"
12871287
msgstr ""
12881288

@@ -1291,7 +1291,7 @@ msgstr ""
12911291
msgid "Invalid socket for TLS"
12921292
msgstr ""
12931293

1294-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1294+
#: ports/espressif/common-hal/espidf/__init__.c
12951295
msgid "Invalid state"
12961296
msgstr ""
12971297

@@ -1323,7 +1323,7 @@ msgstr ""
13231323
msgid "Layer must be a Group or TileGrid subclass"
13241324
msgstr ""
13251325

1326-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1326+
#: ports/espressif/common-hal/espidf/__init__.c
13271327
msgid "MAC address was invalid"
13281328
msgstr ""
13291329

@@ -1679,19 +1679,19 @@ msgstr ""
16791679
msgid "Operation not permitted"
16801680
msgstr ""
16811681

1682-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1682+
#: ports/espressif/common-hal/espidf/__init__.c
16831683
msgid "Operation or feature not supported"
16841684
msgstr ""
16851685

1686-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1686+
#: ports/espressif/common-hal/espidf/__init__.c
16871687
msgid "Operation timed out"
16881688
msgstr ""
16891689

16901690
#: ports/raspberrypi/common-hal/mdns/Server.c
16911691
msgid "Out of MDNS service slots"
16921692
msgstr ""
16931693

1694-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1694+
#: ports/espressif/common-hal/espidf/__init__.c
16951695
msgid "Out of memory"
16961696
msgstr ""
16971697

@@ -1867,7 +1867,7 @@ msgstr ""
18671867
msgid "Read-only filesystem"
18681868
msgstr ""
18691869

1870-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1870+
#: ports/espressif/common-hal/espidf/__init__.c
18711871
msgid "Received response was invalid"
18721872
msgstr ""
18731873

@@ -1887,7 +1887,7 @@ msgstr ""
18871887
msgid "Requested AES mode is unsupported"
18881888
msgstr ""
18891889

1890-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1890+
#: ports/espressif/common-hal/espidf/__init__.c
18911891
msgid "Requested resource not found"
18921892
msgstr ""
18931893

@@ -2338,7 +2338,7 @@ msgstr ""
23382338
msgid "Value length > max_length"
23392339
msgstr ""
23402340

2341-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
2341+
#: ports/espressif/common-hal/espidf/__init__.c
23422342
msgid "Version was invalid"
23432343
msgstr ""
23442344

0 commit comments

Comments
 (0)