Skip to content

Commit adfef8b

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/master' into stm32-dac-deinit
2 parents dfe73a0 + b8373ac commit adfef8b

File tree

103 files changed

+4882
-2850
lines changed

Some content is hidden

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

103 files changed

+4882
-2850
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ jobs:
158158
- "trinket_m0_haxpress"
159159
- "uchip"
160160
- "ugame10"
161+
- "winterbloom_sol"
161162

162163
steps:
163164
- name: Set up Python 3.5

‎lib/utils/interrupt_char.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void mp_keyboard_interrupt(void) {
4949

5050
// Check to see if we've been CTRL-C'ed by autoreload or the user.
5151
bool mp_hal_is_interrupted(void) {
52-
return MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
52+
return MP_STATE_VM(mp_pending_exception) != NULL;
5353
}
5454

5555
#endif

‎locale/ID.po

Lines changed: 89 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-09-08 17:30-0500\n"
11+
"POT-Creation-Date: 2019-10-21 19:50-0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -261,6 +261,10 @@ msgstr "Semua timer untuk pin ini sedang digunakan"
261261
msgid "All timers in use"
262262
msgstr "Semua timer sedang digunakan"
263263

264+
#: ports/nrf/common-hal/_bleio/Adapter.c
265+
msgid "Already advertising."
266+
msgstr ""
267+
264268
#: ports/nrf/common-hal/analogio/AnalogOut.c
265269
msgid "AnalogOut functionality not supported"
266270
msgstr "fungsionalitas AnalogOut tidak didukung"
@@ -329,6 +333,11 @@ msgstr ""
329333
msgid "Brightness not adjustable"
330334
msgstr ""
331335

336+
#: shared-bindings/_bleio/UUID.c
337+
#, c-format
338+
msgid "Buffer + offset too small %d %d %d"
339+
msgstr ""
340+
332341
#: shared-module/usb_hid/Device.c
333342
#, c-format
334343
msgid "Buffer incorrect size. Should be %d bytes."
@@ -465,6 +474,12 @@ msgstr ""
465474
msgid "Command must be an int between 0 and 255"
466475
msgstr ""
467476

477+
#: shared-bindings/_bleio/Connection.c
478+
msgid ""
479+
"Connection has been disconnected and can no longer be used. Create a new "
480+
"connection."
481+
msgstr ""
482+
468483
#: py/persistentcode.c
469484
msgid "Corrupt .mpy file"
470485
msgstr ""
@@ -507,7 +522,7 @@ msgstr ""
507522
msgid "Data chunk must follow fmt chunk"
508523
msgstr ""
509524

510-
#: ports/nrf/common-hal/_bleio/Peripheral.c
525+
#: ports/nrf/common-hal/_bleio/Adapter.c
511526
#, fuzzy
512527
msgid "Data too large for advertisement packet"
513528
msgstr "Tidak bisa menyesuaikan data ke dalam paket advertisment"
@@ -554,10 +569,6 @@ msgstr ""
554569
msgid "Expected a Characteristic"
555570
msgstr ""
556571

557-
#: shared-bindings/_bleio/Service.c
558-
msgid "Expected a Peripheral"
559-
msgstr ""
560-
561572
#: shared-bindings/_bleio/Characteristic.c
562573
msgid "Expected a Service"
563574
msgstr ""
@@ -567,7 +578,7 @@ msgstr ""
567578
msgid "Expected a UUID"
568579
msgstr ""
569580

570-
#: shared-bindings/_bleio/Central.c
581+
#: shared-bindings/_bleio/Adapter.c
571582
msgid "Expected an Address"
572583
msgstr ""
573584

@@ -576,6 +587,11 @@ msgstr ""
576587
msgid "Expected tuple of length %d, got %d"
577588
msgstr ""
578589

590+
#: ports/nrf/common-hal/_bleio/__init__.c
591+
#, c-format
592+
msgid "Failed initiate attribute read, err 0x%04x"
593+
msgstr ""
594+
579595
#: shared-bindings/ps2io/Ps2.c
580596
msgid "Failed sending command."
581597
msgstr ""
@@ -586,20 +602,14 @@ msgid "Failed to acquire mutex, err 0x%04x"
586602
msgstr "Gagal untuk mendapatkan mutex, status: 0x%08lX"
587603

588604
#: ports/nrf/common-hal/_bleio/Service.c
589-
#, fuzzy, c-format
590-
msgid "Failed to add characteristic, err 0x%04x"
591-
msgstr "Gagal untuk menambahkan karakteristik, status: 0x%08lX"
605+
msgid "Failed to add characteristic, NRF_ERROR_%q"
606+
msgstr ""
592607

593608
#: ports/nrf/common-hal/_bleio/Characteristic.c
594609
#, c-format
595610
msgid "Failed to add descriptor, err 0x%04x"
596611
msgstr ""
597612

598-
#: ports/nrf/common-hal/_bleio/Peripheral.c
599-
#, fuzzy, c-format
600-
msgid "Failed to add service, err 0x%04x"
601-
msgstr "Gagal untuk menambahkan layanan, status: 0x%08lX"
602-
603613
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
604614
msgid "Failed to allocate RX buffer"
605615
msgstr "Gagal untuk mengalokasikan buffer RX"
@@ -611,25 +621,22 @@ msgid "Failed to allocate RX buffer of %d bytes"
611621
msgstr "Gagal untuk megalokasikan buffer RX dari %d byte"
612622

613623
#: ports/nrf/common-hal/_bleio/Adapter.c
614-
#, fuzzy
615-
msgid "Failed to change softdevice state"
616-
msgstr "Gagal untuk merubah status softdevice, error: 0x%08lX"
624+
msgid "Failed to change softdevice state, NRF_ERROR_%q"
625+
msgstr ""
617626

618-
#: ports/nrf/common-hal/_bleio/Peripheral.c
619-
#, c-format
620-
msgid "Failed to configure advertising, err 0x%04x"
627+
#: ports/nrf/common-hal/_bleio/Adapter.c
628+
msgid "Failed to connect: internal error"
621629
msgstr ""
622630

623-
#: ports/nrf/common-hal/_bleio/Central.c
631+
#: ports/nrf/common-hal/_bleio/Adapter.c
624632
msgid "Failed to connect: timeout"
625633
msgstr ""
626634

627-
#: ports/nrf/common-hal/_bleio/Scanner.c
628-
#, fuzzy, c-format
629-
msgid "Failed to continue scanning, err 0x%04x"
630-
msgstr "Gagal untuk melanjutkan scanning, status: 0x%08lX"
635+
#: ports/nrf/common-hal/_bleio/Service.c
636+
msgid "Failed to create service, NRF_ERROR_%q"
637+
msgstr ""
631638

632-
#: ports/nrf/common-hal/_bleio/__init__.c
639+
#: ports/nrf/common-hal/_bleio/Connection.c
633640
#, fuzzy
634641
msgid "Failed to discover services"
635642
msgstr "Gagal untuk menemukan layanan, status: 0x%08lX"
@@ -649,7 +656,7 @@ msgstr "Gagal untuk mendapatkan status softdevice, error: 0x%08lX"
649656
msgid "Failed to notify or indicate attribute value, err 0x%04x"
650657
msgstr ""
651658

652-
#: ports/nrf/common-hal/_bleio/Peripheral.c
659+
#: ports/nrf/common-hal/_bleio/Connection.c
653660
msgid "Failed to pair"
654661
msgstr ""
655662

@@ -658,8 +665,7 @@ msgstr ""
658665
msgid "Failed to read CCCD value, err 0x%04x"
659666
msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX"
660667

661-
#: ports/nrf/common-hal/_bleio/Characteristic.c
662-
#: ports/nrf/common-hal/_bleio/Descriptor.c
668+
#: ports/nrf/common-hal/_bleio/__init__.c
663669
#, c-format
664670
msgid "Failed to read attribute value, err 0x%04x"
665671
msgstr ""
@@ -679,35 +685,27 @@ msgstr "Gagal untuk menambahkan Vendor Spesific UUID, status: 0x%08lX"
679685
msgid "Failed to release mutex, err 0x%04x"
680686
msgstr "Gagal untuk melepaskan mutex, status: 0x%08lX"
681687

682-
#: ports/nrf/common-hal/_bleio/Peripheral.c
683-
#, c-format
684-
msgid "Failed to set device name, err 0x%04x"
688+
#: ports/nrf/common-hal/_bleio/Adapter.c
689+
msgid "Failed to start advertising, NRF_ERROR_%q"
685690
msgstr ""
686691

687-
#: ports/nrf/common-hal/_bleio/Peripheral.c
688-
#, fuzzy, c-format
689-
msgid "Failed to start advertising, err 0x%04x"
690-
msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
691-
692-
#: ports/nrf/common-hal/_bleio/Central.c
692+
#: ports/nrf/common-hal/_bleio/Adapter.c
693693
#, c-format
694694
msgid "Failed to start connecting, error 0x%04x"
695695
msgstr ""
696696

697-
#: ports/nrf/common-hal/_bleio/Peripheral.c
698-
#, c-format
699-
msgid "Failed to start pairing, error 0x%04x"
697+
#: ports/nrf/common-hal/_bleio/Connection.c
698+
msgid "Failed to start pairing, NRF_ERROR_%q"
700699
msgstr ""
701700

702-
#: ports/nrf/common-hal/_bleio/Scanner.c
701+
#: ports/nrf/common-hal/_bleio/Adapter.c
703702
#, fuzzy, c-format
704703
msgid "Failed to start scanning, err 0x%04x"
705704
msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"
706705

707-
#: ports/nrf/common-hal/_bleio/Peripheral.c
708-
#, fuzzy, c-format
709-
msgid "Failed to stop advertising, err 0x%04x"
710-
msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
706+
#: ports/nrf/common-hal/_bleio/Adapter.c
707+
msgid "Failed to stop advertising, NRF_ERROR_%q"
708+
msgstr ""
711709

712710
#: ports/nrf/common-hal/_bleio/Characteristic.c
713711
#, c-format
@@ -1004,9 +1002,8 @@ msgstr ""
10041002
msgid "No such file/directory"
10051003
msgstr ""
10061004

1007-
#: ports/nrf/common-hal/_bleio/__init__.c shared-bindings/_bleio/Central.c
1005+
#: ports/nrf/common-hal/_bleio/__init__.c
10081006
#: shared-bindings/_bleio/CharacteristicBuffer.c
1009-
#: shared-bindings/_bleio/Peripheral.c
10101007
#, fuzzy
10111008
msgid "Not connected"
10121009
msgstr "Tidak dapat menyambungkan ke AP"
@@ -1081,6 +1078,10 @@ msgstr "Tambahkan module apapun pada filesystem\n"
10811078
msgid "Pop from an empty Ps2 buffer"
10821079
msgstr ""
10831080

1081+
#: shared-bindings/_bleio/Adapter.c
1082+
msgid "Prefix buffer must be on the heap"
1083+
msgstr ""
1084+
10841085
#: main.c
10851086
msgid "Press any key to enter the REPL. Use CTRL-D to reload."
10861087
msgstr ""
@@ -1151,6 +1152,10 @@ msgstr ""
11511152
msgid "Sample rate too high. It must be less than %d"
11521153
msgstr "Nilai sampel terlalu tinggi. Nilai harus kurang dari %d"
11531154

1155+
#: ports/nrf/common-hal/_bleio/Adapter.c
1156+
msgid "Scan already in progess. Stop with stop_scan."
1157+
msgstr ""
1158+
11541159
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
11551160
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
11561161
msgid "Serializer in use"
@@ -1165,11 +1170,6 @@ msgstr ""
11651170
msgid "Slices not supported"
11661171
msgstr ""
11671172

1168-
#: ports/nrf/common-hal/_bleio/Adapter.c
1169-
#, fuzzy, c-format
1170-
msgid "Soft device assert, id: 0x%08lX, pc: 0x%08lX"
1171-
msgstr "Dukungan soft device, id: 0x%08lX, pc: 0x%08l"
1172-
11731173
#: extmod/modure.c
11741174
msgid "Splitting with sub-captures"
11751175
msgstr "Memisahkan dengan menggunakan sub-captures"
@@ -1984,7 +1984,7 @@ msgstr ""
19841984
msgid "integer required"
19851985
msgstr ""
19861986

1987-
#: shared-bindings/_bleio/Peripheral.c shared-bindings/_bleio/Scanner.c
1987+
#: shared-bindings/_bleio/Adapter.c
19881988
#, c-format
19891989
msgid "interval must be in range %s-%s"
19901990
msgstr ""
@@ -2161,11 +2161,6 @@ msgstr ""
21612161
msgid "name '%q' is not defined"
21622162
msgstr ""
21632163

2164-
#: shared-bindings/_bleio/Peripheral.c
2165-
#, fuzzy
2166-
msgid "name must be a string"
2167-
msgstr "keyword harus berupa string"
2168-
21692164
#: py/runtime.c
21702165
msgid "name not defined"
21712166
msgstr ""
@@ -2216,7 +2211,7 @@ msgstr ""
22162211
msgid "no such attribute"
22172212
msgstr ""
22182213

2219-
#: ports/nrf/common-hal/_bleio/__init__.c
2214+
#: ports/nrf/common-hal/_bleio/Connection.c
22202215
msgid "non-UUID found in service_uuids_whitelist"
22212216
msgstr ""
22222217

@@ -2700,7 +2695,7 @@ msgstr ""
27002695
msgid "value_count must be > 0"
27012696
msgstr ""
27022697

2703-
#: shared-bindings/_bleio/Scanner.c
2698+
#: shared-bindings/_bleio/Adapter.c
27042699
msgid "window must be <= interval"
27052700
msgstr ""
27062701

@@ -2770,10 +2765,22 @@ msgstr ""
27702765
#~ msgid "Failed to acquire mutex"
27712766
#~ msgstr "Gagal untuk mendapatkan mutex, status: 0x%08lX"
27722767

2768+
#, fuzzy, c-format
2769+
#~ msgid "Failed to add characteristic, err 0x%04x"
2770+
#~ msgstr "Gagal untuk menambahkan karakteristik, status: 0x%08lX"
2771+
27732772
#, fuzzy
27742773
#~ msgid "Failed to add service"
27752774
#~ msgstr "Gagal untuk menambahkan layanan, status: 0x%08lX"
27762775

2776+
#, fuzzy, c-format
2777+
#~ msgid "Failed to add service, err 0x%04x"
2778+
#~ msgstr "Gagal untuk menambahkan layanan, status: 0x%08lX"
2779+
2780+
#, fuzzy
2781+
#~ msgid "Failed to change softdevice state"
2782+
#~ msgstr "Gagal untuk merubah status softdevice, error: 0x%08lX"
2783+
27772784
#, fuzzy
27782785
#~ msgid "Failed to connect:"
27792786
#~ msgstr "Gagal untuk menyambungkan, status: 0x%08lX"
@@ -2782,6 +2789,10 @@ msgstr ""
27822789
#~ msgid "Failed to continue scanning"
27832790
#~ msgstr "Gagal untuk melanjutkan scanning, status: 0x%08lX"
27842791

2792+
#, fuzzy, c-format
2793+
#~ msgid "Failed to continue scanning, err 0x%04x"
2794+
#~ msgstr "Gagal untuk melanjutkan scanning, status: 0x%08lX"
2795+
27852796
#, fuzzy
27862797
#~ msgid "Failed to create mutex"
27872798
#~ msgstr "Gagal untuk membuat mutex, status: 0x%08lX"
@@ -2802,6 +2813,10 @@ msgstr ""
28022813
#~ msgid "Failed to start advertising"
28032814
#~ msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
28042815

2816+
#, fuzzy, c-format
2817+
#~ msgid "Failed to start advertising, err 0x%04x"
2818+
#~ msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
2819+
28052820
#, fuzzy
28062821
#~ msgid "Failed to start scanning"
28072822
#~ msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"
@@ -2810,6 +2825,10 @@ msgstr ""
28102825
#~ msgid "Failed to stop advertising"
28112826
#~ msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
28122827

2828+
#, fuzzy, c-format
2829+
#~ msgid "Failed to stop advertising, err 0x%04x"
2830+
#~ msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
2831+
28132832
#~ msgid "GPIO16 does not support pull up."
28142833
#~ msgstr "GPIO16 tidak mendukung pull up"
28152834

@@ -2859,6 +2878,10 @@ msgstr ""
28592878
#~ msgid "STA required"
28602879
#~ msgstr "STA dibutuhkan"
28612880

2881+
#, fuzzy, c-format
2882+
#~ msgid "Soft device assert, id: 0x%08lX, pc: 0x%08lX"
2883+
#~ msgstr "Dukungan soft device, id: 0x%08lX, pc: 0x%08l"
2884+
28622885
#~ msgid "UART(%d) does not exist"
28632886
#~ msgstr "UART(%d) tidak ada"
28642887

@@ -2936,6 +2959,10 @@ msgstr ""
29362959
#~ msgid "memory allocation failed, allocating %u bytes for native code"
29372960
#~ msgstr "alokasi memori gagal, mengalokasikan %u byte untuk kode native"
29382961

2962+
#, fuzzy
2963+
#~ msgid "name must be a string"
2964+
#~ msgstr "keyword harus berupa string"
2965+
29392966
#~ msgid "not a valid ADC Channel: %d"
29402967
#~ msgstr "tidak valid channel ADC: %d"
29412968

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy