Skip to content

Commit 19c59b4

Browse files
dhalbertdhalbert
committed
bleio: API change to create and connect related objects simulatenously: no orphan bleio objects
1 parent a72bcab commit 19c59b4

33 files changed

Lines changed: 610 additions & 834 deletions

‎locale/ID.po‎

Lines changed: 9 additions & 32 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-08-22 14:29-0700\n"
11+
"POT-Creation-Date: 2019-08-28 16:09-0400\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"
@@ -437,18 +437,6 @@ msgstr "tidak dapat mendapatkan ukuran scalar secara tidak ambigu"
437437
msgid "Cannot write without MOSI pin."
438438
msgstr ""
439439

440-
#: shared-bindings/bleio/Service.c
441-
msgid "Characteristic UUID doesn't match Service UUID"
442-
msgstr ""
443-
444-
#: ports/nrf/common-hal/bleio/Service.c
445-
msgid "Characteristic already in use by another Service."
446-
msgstr ""
447-
448-
#: shared-bindings/bleio/Service.c
449-
msgid "Characteristic is already attached to a Service"
450-
msgstr ""
451-
452440
#: shared-bindings/bleio/CharacteristicBuffer.c
453441
msgid "CharacteristicBuffer writing not provided"
454442
msgstr ""
@@ -524,10 +512,6 @@ msgstr ""
524512
msgid "Data too large for advertisement packet"
525513
msgstr "Tidak bisa menyesuaikan data ke dalam paket advertisment"
526514

527-
#: shared-bindings/bleio/Characteristic.c
528-
msgid "Descriptor is already attached to a Characteristic"
529-
msgstr ""
530-
531515
#: shared-bindings/audiobusio/PDMIn.c
532516
msgid "Destination capacity is smaller than destination_length."
533517
msgstr ""
@@ -565,7 +549,7 @@ msgstr ""
565549
msgid "Expected a Characteristic"
566550
msgstr ""
567551

568-
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
552+
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Peripheral.c
569553
#: shared-bindings/bleio/Service.c
570554
msgid "Expected a UUID"
571555
msgstr ""
@@ -588,6 +572,7 @@ msgstr ""
588572
msgid "Failed to acquire mutex, err 0x%04x"
589573
msgstr "Gagal untuk mendapatkan mutex, status: 0x%08lX"
590574

575+
#: ports/nrf/common-hal/bleio/Characteristic.c
591576
#: ports/nrf/common-hal/bleio/Service.c
592577
#, fuzzy, c-format
593578
msgid "Failed to add characteristic, err 0x%04x"
@@ -864,7 +849,7 @@ msgstr "Pin-pin tidak valid"
864849
msgid "Invalid polarity"
865850
msgstr ""
866851

867-
#: shared-bindings/bleio/Characteristic.c
852+
#: shared-bindings/bleio/Service.c
868853
msgid "Invalid properties"
869854
msgstr ""
870855

@@ -1705,10 +1690,6 @@ msgstr "tidak dapat melakukan relative import"
17051690
msgid "casting"
17061691
msgstr ""
17071692

1708-
#: shared-bindings/bleio/Service.c
1709-
msgid "characteristics includes an object that is not a Characteristic"
1710-
msgstr ""
1711-
17121693
#: shared-bindings/_stage/Text.c
17131694
msgid "chars buffer too small"
17141695
msgstr ""
@@ -1769,10 +1750,6 @@ msgstr ""
17691750
msgid "default 'except' must be last"
17701751
msgstr "'except' standar harus terakhir"
17711752

1772-
#: shared-bindings/bleio/Characteristic.c
1773-
msgid "descriptors includes an object that is not a Descriptors"
1774-
msgstr ""
1775-
17761753
#: shared-bindings/audiobusio/PDMIn.c
17771754
msgid ""
17781755
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
@@ -2112,7 +2089,6 @@ msgstr ""
21122089
msgid "math domain error"
21132090
msgstr ""
21142091

2115-
#: ports/nrf/common-hal/bleio/Characteristic.c
21162092
#: ports/nrf/common-hal/bleio/Descriptor.c
21172093
#, c-format
21182094
msgid "max_length must be 0-%d when fixed_length is %s"
@@ -2131,6 +2107,11 @@ msgstr ""
21312107
msgid "memory allocation failed, heap is locked"
21322108
msgstr ""
21332109

2110+
#: ports/nrf/common-hal/bleio/Characteristic.c
2111+
#, c-format
2112+
msgid "mnax_length must be 0-%d when fixed_length is %s"
2113+
msgstr ""
2114+
21342115
#: py/builtinimport.c
21352116
msgid "module not found"
21362117
msgstr "modul tidak ditemukan"
@@ -2218,10 +2199,6 @@ msgstr ""
22182199
msgid "no such attribute"
22192200
msgstr ""
22202201

2221-
#: shared-bindings/bleio/Peripheral.c
2222-
msgid "non-Service found in services"
2223-
msgstr ""
2224-
22252202
#: ports/nrf/common-hal/bleio/__init__.c
22262203
msgid "non-UUID found in service_uuids_whitelist"
22272204
msgstr ""

‎locale/circuitpython.pot‎

Lines changed: 9 additions & 32 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-08-22 14:29-0700\n"
11+
"POT-Creation-Date: 2019-08-28 16:09-0400\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"
@@ -427,18 +427,6 @@ msgstr ""
427427
msgid "Cannot write without MOSI pin."
428428
msgstr ""
429429

430-
#: shared-bindings/bleio/Service.c
431-
msgid "Characteristic UUID doesn't match Service UUID"
432-
msgstr ""
433-
434-
#: ports/nrf/common-hal/bleio/Service.c
435-
msgid "Characteristic already in use by another Service."
436-
msgstr ""
437-
438-
#: shared-bindings/bleio/Service.c
439-
msgid "Characteristic is already attached to a Service"
440-
msgstr ""
441-
442430
#: shared-bindings/bleio/CharacteristicBuffer.c
443431
msgid "CharacteristicBuffer writing not provided"
444432
msgstr ""
@@ -513,10 +501,6 @@ msgstr ""
513501
msgid "Data too large for advertisement packet"
514502
msgstr ""
515503

516-
#: shared-bindings/bleio/Characteristic.c
517-
msgid "Descriptor is already attached to a Characteristic"
518-
msgstr ""
519-
520504
#: shared-bindings/audiobusio/PDMIn.c
521505
msgid "Destination capacity is smaller than destination_length."
522506
msgstr ""
@@ -554,7 +538,7 @@ msgstr ""
554538
msgid "Expected a Characteristic"
555539
msgstr ""
556540

557-
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
541+
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Peripheral.c
558542
#: shared-bindings/bleio/Service.c
559543
msgid "Expected a UUID"
560544
msgstr ""
@@ -577,6 +561,7 @@ msgstr ""
577561
msgid "Failed to acquire mutex, err 0x%04x"
578562
msgstr ""
579563

564+
#: ports/nrf/common-hal/bleio/Characteristic.c
580565
#: ports/nrf/common-hal/bleio/Service.c
581566
#, c-format
582567
msgid "Failed to add characteristic, err 0x%04x"
@@ -849,7 +834,7 @@ msgstr ""
849834
msgid "Invalid polarity"
850835
msgstr ""
851836

852-
#: shared-bindings/bleio/Characteristic.c
837+
#: shared-bindings/bleio/Service.c
853838
msgid "Invalid properties"
854839
msgstr ""
855840

@@ -1671,10 +1656,6 @@ msgstr ""
16711656
msgid "casting"
16721657
msgstr ""
16731658

1674-
#: shared-bindings/bleio/Service.c
1675-
msgid "characteristics includes an object that is not a Characteristic"
1676-
msgstr ""
1677-
16781659
#: shared-bindings/_stage/Text.c
16791660
msgid "chars buffer too small"
16801661
msgstr ""
@@ -1735,10 +1716,6 @@ msgstr ""
17351716
msgid "default 'except' must be last"
17361717
msgstr ""
17371718

1738-
#: shared-bindings/bleio/Characteristic.c
1739-
msgid "descriptors includes an object that is not a Descriptors"
1740-
msgstr ""
1741-
17421719
#: shared-bindings/audiobusio/PDMIn.c
17431720
msgid ""
17441721
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
@@ -2078,7 +2055,6 @@ msgstr ""
20782055
msgid "math domain error"
20792056
msgstr ""
20802057

2081-
#: ports/nrf/common-hal/bleio/Characteristic.c
20822058
#: ports/nrf/common-hal/bleio/Descriptor.c
20832059
#, c-format
20842060
msgid "max_length must be 0-%d when fixed_length is %s"
@@ -2097,6 +2073,11 @@ msgstr ""
20972073
msgid "memory allocation failed, heap is locked"
20982074
msgstr ""
20992075

2076+
#: ports/nrf/common-hal/bleio/Characteristic.c
2077+
#, c-format
2078+
msgid "mnax_length must be 0-%d when fixed_length is %s"
2079+
msgstr ""
2080+
21002081
#: py/builtinimport.c
21012082
msgid "module not found"
21022083
msgstr ""
@@ -2183,10 +2164,6 @@ msgstr ""
21832164
msgid "no such attribute"
21842165
msgstr ""
21852166

2186-
#: shared-bindings/bleio/Peripheral.c
2187-
msgid "non-Service found in services"
2188-
msgstr ""
2189-
21902167
#: ports/nrf/common-hal/bleio/__init__.c
21912168
msgid "non-UUID found in service_uuids_whitelist"
21922169
msgstr ""

‎locale/de_DE.po‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-08-22 14:29-0700\n"
10+
"POT-Creation-Date: 2019-08-28 16:09-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -431,18 +431,6 @@ msgstr "sizeof scalar kann nicht eindeutig bestimmt werden"
431431
msgid "Cannot write without MOSI pin."
432432
msgstr "Kann nicht ohne MOSI-Pin schreiben."
433433

434-
#: shared-bindings/bleio/Service.c
435-
msgid "Characteristic UUID doesn't match Service UUID"
436-
msgstr "Characteristic UUID stimmt nicht mit der Service-UUID überein"
437-
438-
#: ports/nrf/common-hal/bleio/Service.c
439-
msgid "Characteristic already in use by another Service."
440-
msgstr "Characteristic wird bereits von einem anderen Dienst verwendet."
441-
442-
#: shared-bindings/bleio/Service.c
443-
msgid "Characteristic is already attached to a Service"
444-
msgstr ""
445-
446434
#: shared-bindings/bleio/CharacteristicBuffer.c
447435
msgid "CharacteristicBuffer writing not provided"
448436
msgstr "Schreiben von CharacteristicBuffer ist nicht vorgesehen"
@@ -517,10 +505,6 @@ msgstr ""
517505
msgid "Data too large for advertisement packet"
518506
msgstr "Zu vielen Daten für das advertisement packet"
519507

520-
#: shared-bindings/bleio/Characteristic.c
521-
msgid "Descriptor is already attached to a Characteristic"
522-
msgstr ""
523-
524508
#: shared-bindings/audiobusio/PDMIn.c
525509
msgid "Destination capacity is smaller than destination_length."
526510
msgstr "Die Zielkapazität ist kleiner als destination_length."
@@ -558,7 +542,7 @@ msgstr "Erwartet ein(e) %q"
558542
msgid "Expected a Characteristic"
559543
msgstr "Characteristic wird erwartet"
560544

561-
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
545+
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Peripheral.c
562546
#: shared-bindings/bleio/Service.c
563547
msgid "Expected a UUID"
564548
msgstr "Eine UUID wird erwartet"
@@ -581,6 +565,7 @@ msgstr ""
581565
msgid "Failed to acquire mutex, err 0x%04x"
582566
msgstr "Mutex konnte nicht akquiriert werden. Status: 0x%04x"
583567

568+
#: ports/nrf/common-hal/bleio/Characteristic.c
584569
#: ports/nrf/common-hal/bleio/Service.c
585570
#, c-format
586571
msgid "Failed to add characteristic, err 0x%04x"
@@ -855,7 +840,7 @@ msgstr "Ungültige Pins"
855840
msgid "Invalid polarity"
856841
msgstr "Ungültige Polarität"
857842

858-
#: shared-bindings/bleio/Characteristic.c
843+
#: shared-bindings/bleio/Service.c
859844
msgid "Invalid properties"
860845
msgstr ""
861846

@@ -1711,10 +1696,6 @@ msgstr "kann keinen relativen Import durchführen"
17111696
msgid "casting"
17121697
msgstr ""
17131698

1714-
#: shared-bindings/bleio/Service.c
1715-
msgid "characteristics includes an object that is not a Characteristic"
1716-
msgstr ""
1717-
17181699
#: shared-bindings/_stage/Text.c
17191700
msgid "chars buffer too small"
17201701
msgstr ""
@@ -1775,10 +1756,6 @@ msgstr ""
17751756
msgid "default 'except' must be last"
17761757
msgstr "Die Standart-Ausnahmebehandlung muss als letztes sein"
17771758

1778-
#: shared-bindings/bleio/Characteristic.c
1779-
msgid "descriptors includes an object that is not a Descriptors"
1780-
msgstr ""
1781-
17821759
#: shared-bindings/audiobusio/PDMIn.c
17831760
msgid ""
17841761
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
@@ -2125,7 +2102,6 @@ msgstr "map buffer zu klein"
21252102
msgid "math domain error"
21262103
msgstr ""
21272104

2128-
#: ports/nrf/common-hal/bleio/Characteristic.c
21292105
#: ports/nrf/common-hal/bleio/Descriptor.c
21302106
#, c-format
21312107
msgid "max_length must be 0-%d when fixed_length is %s"
@@ -2144,6 +2120,11 @@ msgstr "Speicherzuordnung fehlgeschlagen, Zuweisung von %u Bytes"
21442120
msgid "memory allocation failed, heap is locked"
21452121
msgstr "Speicherzuweisung fehlgeschlagen, der Heap ist gesperrt"
21462122

2123+
#: ports/nrf/common-hal/bleio/Characteristic.c
2124+
#, c-format
2125+
msgid "mnax_length must be 0-%d when fixed_length is %s"
2126+
msgstr ""
2127+
21472128
#: py/builtinimport.c
21482129
msgid "module not found"
21492130
msgstr "Modul nicht gefunden"
@@ -2230,10 +2211,6 @@ msgstr ""
22302211
msgid "no such attribute"
22312212
msgstr ""
22322213

2233-
#: shared-bindings/bleio/Peripheral.c
2234-
msgid "non-Service found in services"
2235-
msgstr ""
2236-
22372214
#: ports/nrf/common-hal/bleio/__init__.c
22382215
msgid "non-UUID found in service_uuids_whitelist"
22392216
msgstr ""
@@ -2790,6 +2767,12 @@ msgstr ""
27902767
#~ msgid "Cannot update i/f status"
27912768
#~ msgstr "Kann i/f Status nicht updaten"
27922769

2770+
#~ msgid "Characteristic UUID doesn't match Service UUID"
2771+
#~ msgstr "Characteristic UUID stimmt nicht mit der Service-UUID überein"
2772+
2773+
#~ msgid "Characteristic already in use by another Service."
2774+
#~ msgstr "Characteristic wird bereits von einem anderen Dienst verwendet."
2775+
27932776
#~ msgid "Data too large for the advertisement packet"
27942777
#~ msgstr "Daten sind zu groß für das advertisement packet"
27952778

0 commit comments

Comments
 (0)