Skip to content

Commit 23fb5f6

Browse files
EmergReanimatorEmergReanimator
committed
Merge branch 'main' of [email protected]:adafruit/circuitpython.git into spi_flash_fix
2 parents 2a1f586 + 93a60ee commit 23fb5f6

File tree

104 files changed

+4369
-235
lines changed

Some content is hidden

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

104 files changed

+4369
-235
lines changed

‎.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

‎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: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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 ""
@@ -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 ""
@@ -1584,6 +1590,10 @@ msgstr ""
15841590
msgid "Name too long"
15851591
msgstr ""
15861592

1593+
#: ports/espressif/common-hal/_bleio/__init__.c
1594+
msgid "Nimble out of memory"
1595+
msgstr ""
1596+
15871597
#: ports/nrf/common-hal/_bleio/Characteristic.c
15881598
msgid "No CCCD for this Characteristic"
15891599
msgstr ""
@@ -1731,6 +1741,7 @@ msgstr ""
17311741
msgid "Not a valid IP string"
17321742
msgstr ""
17331743

1744+
#: ports/espressif/common-hal/_bleio/__init__.c
17341745
#: ports/nrf/common-hal/_bleio/__init__.c
17351746
#: shared-bindings/_bleio/CharacteristicBuffer.c
17361747
msgid "Not connected"
@@ -2110,6 +2121,7 @@ msgstr ""
21102121
msgid "Scale dimensions must divide by 3"
21112122
msgstr ""
21122123

2124+
#: ports/espressif/common-hal/_bleio/Adapter.c
21132125
#: ports/nrf/common-hal/_bleio/Adapter.c
21142126
msgid "Scan already in progess. Stop with stop_scan."
21152127
msgstr ""
@@ -2268,6 +2280,7 @@ msgstr ""
22682280
msgid "Time is in the past."
22692281
msgstr ""
22702282

2283+
#: ports/espressif/common-hal/_bleio/Adapter.c
22712284
#: ports/nrf/common-hal/_bleio/Adapter.c
22722285
#, c-format
22732286
msgid "Timeout is too long: Maximum timeout length is %d seconds"
@@ -2290,6 +2303,7 @@ msgstr ""
22902303
msgid "Too many displays"
22912304
msgstr ""
22922305

2306+
#: ports/espressif/common-hal/_bleio/PacketBuffer.c
22932307
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
22942308
msgid "Total data to write is larger than %q"
22952309
msgstr ""
@@ -2421,11 +2435,21 @@ msgstr ""
24212435
msgid "Unknown security error: 0x%04x"
24222436
msgstr ""
24232437

2438+
#: ports/espressif/common-hal/_bleio/__init__.c
2439+
#, c-format
2440+
msgid "Unknown system firmware error at %s:%d: %d"
2441+
msgstr ""
2442+
24242443
#: ports/nrf/common-hal/_bleio/__init__.c
24252444
#, c-format
24262445
msgid "Unknown system firmware error: %04x"
24272446
msgstr ""
24282447

2448+
#: ports/espressif/common-hal/_bleio/__init__.c
2449+
#, c-format
2450+
msgid "Unknown system firmware error: %d"
2451+
msgstr ""
2452+
24292453
#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
24302454
#, c-format
24312455
msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -2463,11 +2487,13 @@ msgstr ""
24632487
msgid "Update Failed"
24642488
msgstr ""
24652489

2490+
#: ports/espressif/common-hal/_bleio/Descriptor.c
24662491
#: ports/nrf/common-hal/_bleio/Characteristic.c
24672492
#: ports/nrf/common-hal/_bleio/Descriptor.c
24682493
msgid "Value length != required fixed length"
24692494
msgstr ""
24702495

2496+
#: ports/espressif/common-hal/_bleio/Descriptor.c
24712497
#: ports/nrf/common-hal/_bleio/Characteristic.c
24722498
#: ports/nrf/common-hal/_bleio/Descriptor.c
24732499
msgid "Value length > max_length"
@@ -2525,6 +2551,7 @@ msgstr ""
25252551
msgid "Woken up by alarm.\n"
25262552
msgstr ""
25272553

2554+
#: ports/espressif/common-hal/_bleio/PacketBuffer.c
25282555
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
25292556
msgid "Writes not supported on Characteristic"
25302557
msgstr ""
@@ -3592,6 +3619,7 @@ msgstr ""
35923619
msgid "matrix is not positive definite"
35933620
msgstr ""
35943621

3622+
#: ports/espressif/common-hal/_bleio/Descriptor.c
35953623
#: ports/nrf/common-hal/_bleio/Characteristic.c
35963624
#: ports/nrf/common-hal/_bleio/Descriptor.c
35973625
#, c-format

0 commit comments

Comments
 (0)