Skip to content

Commit 5972fdc

Browse files
gamblor21gamblor21
authored
Merge branch 'main' into is31pixelbuf
2 parents 02728f1 + 2964e96 commit 5972fdc

140 files changed

Lines changed: 4673 additions & 379 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ on:
1212
check_suite:
1313
types: [rerequested]
1414

15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
17+
cancel-in-progress: true
18+
1519
jobs:
1620
test:
1721
runs-on: ubuntu-20.04

‎.github/workflows/ports_windows.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ on:
1212
- 'ports/unix/**'
1313
- 'ports/windows/**'
1414

15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
17+
cancel-in-progress: true
18+
1519
jobs:
1620
build:
1721
runs-on: windows-2019

‎.github/workflows/pre-commit.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
pull_request:
99
push:
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
pre-commit:
1317
runs-on: ubuntu-20.04

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
[submodule "ports/espressif/esp-idf"]
150150
path = ports/espressif/esp-idf
151151
url = https://github.com/adafruit/esp-idf.git
152-
branch = release/v4.4
152+
branch = circuitpython-v4.4
153153
[submodule "ports/espressif/certificates/nina-fw"]
154154
path = ports/espressif/certificates/nina-fw
155155
url = https://github.com/adafruit/nina-fw.git

‎devices/ble_hci/common-hal/_bleio/__init__.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include "hci.h"
3636

3737
void bleio_hci_background(void);
38-
void bleio_reset(void);
3938

4039
typedef struct {
4140
// ble_gap_enc_key_t own_enc;

‎locale/ID.po‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ msgstr "Semua timer untuk pin ini sedang digunakan"
454454
msgid "All timers in use"
455455
msgstr "Semua timer sedang digunakan"
456456

457+
#: ports/espressif/common-hal/_bleio/Adapter.c
457458
#: ports/nrf/common-hal/_bleio/Adapter.c
458459
msgid "Already advertising."
459460
msgstr "Sudah disebarkan."
@@ -927,10 +928,12 @@ msgstr "Data 0 pin harus byte disejajarkan"
927928
msgid "Data chunk must follow fmt chunk"
928929
msgstr "Potongan data harus mengikuti fmt chunk"
929930

931+
#: ports/espressif/common-hal/_bleio/Adapter.c
930932
#: ports/nrf/common-hal/_bleio/Adapter.c
931933
msgid "Data not supported with directed advertising"
932934
msgstr ""
933935

936+
#: ports/espressif/common-hal/_bleio/Adapter.c
934937
#: ports/nrf/common-hal/_bleio/Adapter.c
935938
msgid "Data too large for advertisement packet"
936939
msgstr "Data terlalu besar untuk paket advertisment"
@@ -1011,6 +1014,7 @@ msgstr ""
10111014
msgid "Expected tuple of length %d, got %d"
10121015
msgstr "Diharapkan tuple dengan panjang %d, didapatkan %d"
10131016

1017+
#: ports/espressif/common-hal/_bleio/Adapter.c
10141018
#: ports/nrf/common-hal/_bleio/Adapter.c
10151019
msgid "Extended advertisements with scan response not supported."
10161020
msgstr "Penyebaran yang diperluas dengan respon pindai tidak didukung."
@@ -1064,6 +1068,7 @@ msgstr ""
10641068
msgid "Failed to buffer the sample"
10651069
msgstr ""
10661070

1071+
#: ports/espressif/common-hal/_bleio/Adapter.c
10671072
#: ports/nrf/common-hal/_bleio/Adapter.c
10681073
msgid "Failed to connect: internal error"
10691074
msgstr "Gagal terhubung: kesalahan internal"
@@ -1297,6 +1302,7 @@ msgstr "Nilai Unit ADC tidak valid"
12971302
msgid "Invalid AuthMode"
12981303
msgstr ""
12991304

1305+
#: ports/espressif/common-hal/_bleio/__init__.c
13001306
#: ports/nrf/common-hal/_bleio/__init__.c
13011307
msgid "Invalid BLE parameter"
13021308
msgstr ""
@@ -1605,6 +1611,10 @@ msgstr ""
16051611
msgid "Name too long"
16061612
msgstr "Nama terlalu panjang"
16071613

1614+
#: ports/espressif/common-hal/_bleio/__init__.c
1615+
msgid "Nimble out of memory"
1616+
msgstr ""
1617+
16081618
#: ports/nrf/common-hal/_bleio/Characteristic.c
16091619
msgid "No CCCD for this Characteristic"
16101620
msgstr "Tidak ada CCCD untuk Karakteristik ini"
@@ -1752,6 +1762,7 @@ msgstr ""
17521762
msgid "Not a valid IP string"
17531763
msgstr ""
17541764

1765+
#: ports/espressif/common-hal/_bleio/__init__.c
17551766
#: ports/nrf/common-hal/_bleio/__init__.c
17561767
#: shared-bindings/_bleio/CharacteristicBuffer.c
17571768
msgid "Not connected"
@@ -2145,6 +2156,7 @@ msgstr "Nilai sampel terlalu tinggi. Nilai harus kurang dari %d"
21452156
msgid "Scale dimensions must divide by 3"
21462157
msgstr ""
21472158

2159+
#: ports/espressif/common-hal/_bleio/Adapter.c
21482160
#: ports/nrf/common-hal/_bleio/Adapter.c
21492161
msgid "Scan already in progess. Stop with stop_scan."
21502162
msgstr "Pindai sudah dalam proses. Hentikan dengan stop_scan."
@@ -2303,6 +2315,7 @@ msgstr "Lebar ubin harus persis membagi lebar bitmap"
23032315
msgid "Time is in the past."
23042316
msgstr ""
23052317

2318+
#: ports/espressif/common-hal/_bleio/Adapter.c
23062319
#: ports/nrf/common-hal/_bleio/Adapter.c
23072320
#, c-format
23082321
msgid "Timeout is too long: Maximum timeout length is %d seconds"
@@ -2325,6 +2338,7 @@ msgstr "Terlalu banyak tampilan bus"
23252338
msgid "Too many displays"
23262339
msgstr "Terlalu banyak tampilan"
23272340

2341+
#: ports/espressif/common-hal/_bleio/PacketBuffer.c
23282342
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
23292343
msgid "Total data to write is larger than %q"
23302344
msgstr ""
@@ -2456,11 +2470,21 @@ msgstr "Alasan yang tidak diketahui."
24562470
msgid "Unknown security error: 0x%04x"
24572471
msgstr "Kesalahan keamanan tidak dikenal: 0x%04x"
24582472

2473+
#: ports/espressif/common-hal/_bleio/__init__.c
2474+
#, c-format
2475+
msgid "Unknown system firmware error at %s:%d: %d"
2476+
msgstr ""
2477+
24592478
#: ports/nrf/common-hal/_bleio/__init__.c
24602479
#, c-format
24612480
msgid "Unknown system firmware error: %04x"
24622481
msgstr ""
24632482

2483+
#: ports/espressif/common-hal/_bleio/__init__.c
2484+
#, c-format
2485+
msgid "Unknown system firmware error: %d"
2486+
msgstr ""
2487+
24642488
#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
24652489
#, c-format
24662490
msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -2500,11 +2524,13 @@ msgstr "Operasi yang tidak didukung"
25002524
msgid "Update Failed"
25012525
msgstr ""
25022526

2527+
#: ports/espressif/common-hal/_bleio/Descriptor.c
25032528
#: ports/nrf/common-hal/_bleio/Characteristic.c
25042529
#: ports/nrf/common-hal/_bleio/Descriptor.c
25052530
msgid "Value length != required fixed length"
25062531
msgstr "Panjang nilai != Panjang tetap yang dibutuhkan"
25072532

2533+
#: ports/espressif/common-hal/_bleio/Descriptor.c
25082534
#: ports/nrf/common-hal/_bleio/Characteristic.c
25092535
#: ports/nrf/common-hal/_bleio/Descriptor.c
25102536
msgid "Value length > max_length"
@@ -2562,6 +2588,7 @@ msgstr ""
25622588
msgid "Woken up by alarm.\n"
25632589
msgstr ""
25642590

2591+
#: ports/espressif/common-hal/_bleio/PacketBuffer.c
25652592
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
25662593
msgid "Writes not supported on Characteristic"
25672594
msgstr "Menulis tidak didukung pada Karakteristik"
@@ -3629,6 +3656,7 @@ msgstr ""
36293656
msgid "matrix is not positive definite"
36303657
msgstr ""
36313658

3659+
#: ports/espressif/common-hal/_bleio/Descriptor.c
36323660
#: ports/nrf/common-hal/_bleio/Characteristic.c
36333661
#: ports/nrf/common-hal/_bleio/Descriptor.c
36343662
#, c-format

‎locale/circuitpython.pot‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ msgstr ""
9999
msgid "%q length must be %d-%d"
100100
msgstr ""
101101

102-
#: shared-bindings/usb_hid/Device.c
102+
#: shared-bindings/busio/I2C.c shared-bindings/usb_hid/Device.c
103103
msgid "%q length must be >= 1"
104104
msgstr ""
105105

@@ -446,6 +446,7 @@ msgstr ""
446446
msgid "All timers in use"
447447
msgstr ""
448448

449+
#: ports/espressif/common-hal/_bleio/Adapter.c
449450
#: ports/nrf/common-hal/_bleio/Adapter.c
450451
msgid "Already advertising."
451452
msgstr ""
@@ -630,7 +631,7 @@ msgstr ""
630631
msgid "Buffer must be a multiple of 512 bytes"
631632
msgstr ""
632633

633-
#: shared-bindings/bitbangio/I2C.c shared-bindings/busio/I2C.c
634+
#: shared-bindings/bitbangio/I2C.c
634635
msgid "Buffer must be at least length 1"
635636
msgstr ""
636637

@@ -908,10 +909,12 @@ msgstr ""
908909
msgid "Data chunk must follow fmt chunk"
909910
msgstr ""
910911

912+
#: ports/espressif/common-hal/_bleio/Adapter.c
911913
#: ports/nrf/common-hal/_bleio/Adapter.c
912914
msgid "Data not supported with directed advertising"
913915
msgstr ""
914916

917+
#: ports/espressif/common-hal/_bleio/Adapter.c
915918
#: ports/nrf/common-hal/_bleio/Adapter.c
916919
msgid "Data too large for advertisement packet"
917920
msgstr ""
@@ -992,6 +995,7 @@ msgstr ""
992995
msgid "Expected tuple of length %d, got %d"
993996
msgstr ""
994997

998+
#: ports/espressif/common-hal/_bleio/Adapter.c
995999
#: ports/nrf/common-hal/_bleio/Adapter.c
9961000
msgid "Extended advertisements with scan response not supported."
9971001
msgstr ""
@@ -1045,6 +1049,7 @@ msgstr ""
10451049
msgid "Failed to buffer the sample"
10461050
msgstr ""
10471051

1052+
#: ports/espressif/common-hal/_bleio/Adapter.c
10481053
#: ports/nrf/common-hal/_bleio/Adapter.c
10491054
msgid "Failed to connect: internal error"
10501055
msgstr ""
@@ -1276,6 +1281,7 @@ msgstr ""
12761281
msgid "Invalid AuthMode"
12771282
msgstr ""
12781283

1284+
#: ports/espressif/common-hal/_bleio/__init__.c
12791285
#: ports/nrf/common-hal/_bleio/__init__.c
12801286
msgid "Invalid BLE parameter"
12811287
msgstr ""
@@ -1588,6 +1594,10 @@ msgstr ""
15881594
msgid "Name too long"
15891595
msgstr ""
15901596

1597+
#: ports/espressif/common-hal/_bleio/__init__.c
1598+
msgid "Nimble out of memory"
1599+
msgstr ""
1600+
15911601
#: ports/nrf/common-hal/_bleio/Characteristic.c
15921602
msgid "No CCCD for this Characteristic"
15931603
msgstr ""
@@ -1610,7 +1620,7 @@ msgstr ""
16101620

16111621
#: shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
16121622
#, c-format
1613-
msgid "No I2C device at address: %x"
1623+
msgid "No I2C device at address: 0x%x"
16141624
msgstr ""
16151625

16161626
#: ports/espressif/common-hal/busio/SPI.c
@@ -1735,6 +1745,7 @@ msgstr ""
17351745
msgid "Not a valid IP string"
17361746
msgstr ""
17371747

1748+
#: ports/espressif/common-hal/_bleio/__init__.c
17381749
#: ports/nrf/common-hal/_bleio/__init__.c
17391750
#: shared-bindings/_bleio/CharacteristicBuffer.c
17401751
msgid "Not connected"
@@ -2114,6 +2125,7 @@ msgstr ""
21142125
msgid "Scale dimensions must divide by 3"
21152126
msgstr ""
21162127

2128+
#: ports/espressif/common-hal/_bleio/Adapter.c
21172129
#: ports/nrf/common-hal/_bleio/Adapter.c
21182130
msgid "Scan already in progess. Stop with stop_scan."
21192131
msgstr ""
@@ -2272,6 +2284,7 @@ msgstr ""
22722284
msgid "Time is in the past."
22732285
msgstr ""
22742286

2287+
#: ports/espressif/common-hal/_bleio/Adapter.c
22752288
#: ports/nrf/common-hal/_bleio/Adapter.c
22762289
#, c-format
22772290
msgid "Timeout is too long: Maximum timeout length is %d seconds"
@@ -2294,6 +2307,7 @@ msgstr ""
22942307
msgid "Too many displays"
22952308
msgstr ""
22962309

2310+
#: ports/espressif/common-hal/_bleio/PacketBuffer.c
22972311
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
22982312
msgid "Total data to write is larger than %q"
22992313
msgstr ""
@@ -2425,11 +2439,21 @@ msgstr ""
24252439
msgid "Unknown security error: 0x%04x"
24262440
msgstr ""
24272441

2442+
#: ports/espressif/common-hal/_bleio/__init__.c
2443+
#, c-format
2444+
msgid "Unknown system firmware error at %s:%d: %d"
2445+
msgstr ""
2446+
24282447
#: ports/nrf/common-hal/_bleio/__init__.c
24292448
#, c-format
24302449
msgid "Unknown system firmware error: %04x"
24312450
msgstr ""
24322451

2452+
#: ports/espressif/common-hal/_bleio/__init__.c
2453+
#, c-format
2454+
msgid "Unknown system firmware error: %d"
2455+
msgstr ""
2456+
24332457
#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
24342458
#, c-format
24352459
msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -2467,11 +2491,13 @@ msgstr ""
24672491
msgid "Update Failed"
24682492
msgstr ""
24692493

2494+
#: ports/espressif/common-hal/_bleio/Descriptor.c
24702495
#: ports/nrf/common-hal/_bleio/Characteristic.c
24712496
#: ports/nrf/common-hal/_bleio/Descriptor.c
24722497
msgid "Value length != required fixed length"
24732498
msgstr ""
24742499

2500+
#: ports/espressif/common-hal/_bleio/Descriptor.c
24752501
#: ports/nrf/common-hal/_bleio/Characteristic.c
24762502
#: ports/nrf/common-hal/_bleio/Descriptor.c
24772503
msgid "Value length > max_length"
@@ -2529,6 +2555,7 @@ msgstr ""
25292555
msgid "Woken up by alarm.\n"
25302556
msgstr ""
25312557

2558+
#: ports/espressif/common-hal/_bleio/PacketBuffer.c
25322559
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
25332560
msgid "Writes not supported on Characteristic"
25342561
msgstr ""
@@ -3596,6 +3623,7 @@ msgstr ""
35963623
msgid "matrix is not positive definite"
35973624
msgstr ""
35983625

3626+
#: ports/espressif/common-hal/_bleio/Descriptor.c
35993627
#: ports/nrf/common-hal/_bleio/Characteristic.c
36003628
#: ports/nrf/common-hal/_bleio/Descriptor.c
36013629
#, c-format
@@ -4045,7 +4073,10 @@ msgstr ""
40454073
#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h
40464074
#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h
40474075
#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
4076+
#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h
4077+
#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h
40484078
#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h
4079+
#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h
40494080
msgid "pressing boot button at start up.\n"
40504081
msgstr ""
40514082

0 commit comments

Comments
 (0)