Skip to content

Commit 85d7398

Browse files
tannewttannewt
authored
Merge pull request micropython#2066 from dhalbert/ble-pairing
BLE: more features
2 parents d244f7e + 630c923 commit 85d7398

Some content is hidden

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

58 files changed

+2422
-1324
lines changed

‎locale/ID.po

+59-13
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-05 17:52-0700\n"
11+
"POT-Creation-Date: 2019-08-15 21:44-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 <[email protected]>\n"
@@ -364,7 +364,7 @@ msgid "Can not use dotstar with %s"
364364
msgstr ""
365365

366366
#: ports/nrf/common-hal/bleio/Characteristic.c
367-
msgid "Can't set CCCD for local Characteristic"
367+
msgid "Can't set CCCD on local Characteristic"
368368
msgstr ""
369369

370370
#: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
@@ -433,6 +433,10 @@ msgstr ""
433433
msgid "Characteristic already in use by another Service."
434434
msgstr ""
435435

436+
#: shared-bindings/bleio/Service.c
437+
msgid "Characteristic is already attached to a Service"
438+
msgstr ""
439+
436440
#: shared-bindings/bleio/CharacteristicBuffer.c
437441
msgid "CharacteristicBuffer writing not provided"
438442
msgstr ""
@@ -508,6 +512,10 @@ msgstr ""
508512
msgid "Data too large for advertisement packet"
509513
msgstr "Tidak bisa menyesuaikan data ke dalam paket advertisment"
510514

515+
#: shared-bindings/bleio/Characteristic.c
516+
msgid "Descriptor is already attached to a Characteristic"
517+
msgstr ""
518+
511519
#: shared-bindings/audiobusio/PDMIn.c
512520
msgid "Destination capacity is smaller than destination_length."
513521
msgstr ""
@@ -602,7 +610,7 @@ msgstr ""
602610
msgid "Failed to continue scanning, err 0x%04x"
603611
msgstr "Gagal untuk melanjutkan scanning, status: 0x%08lX"
604612

605-
#: ports/nrf/common-hal/bleio/Central.c
613+
#: ports/nrf/common-hal/bleio/__init__.c
606614
#, fuzzy
607615
msgid "Failed to discover services"
608616
msgstr "Gagal untuk menemukan layanan, status: 0x%08lX"
@@ -622,17 +630,22 @@ msgstr "Gagal untuk mendapatkan status softdevice, error: 0x%08lX"
622630
msgid "Failed to notify or indicate attribute value, err 0x%04x"
623631
msgstr ""
624632

633+
#: ports/nrf/common-hal/bleio/Peripheral.c
634+
msgid "Failed to pair"
635+
msgstr ""
636+
625637
#: ports/nrf/common-hal/bleio/Characteristic.c
626638
#, fuzzy, c-format
627639
msgid "Failed to read CCCD value, err 0x%04x"
628640
msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX"
629641

630642
#: ports/nrf/common-hal/bleio/Characteristic.c
643+
#: ports/nrf/common-hal/bleio/Descriptor.c
631644
#, c-format
632645
msgid "Failed to read attribute value, err 0x%04x"
633646
msgstr ""
634647

635-
#: ports/nrf/common-hal/bleio/Characteristic.c
648+
#: ports/nrf/common-hal/bleio/__init__.c
636649
#, fuzzy, c-format
637650
msgid "Failed to read gatts value, err 0x%04x"
638651
msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
@@ -662,6 +675,11 @@ msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
662675
msgid "Failed to start connecting, error 0x%04x"
663676
msgstr ""
664677

678+
#: ports/nrf/common-hal/bleio/Peripheral.c
679+
#, c-format
680+
msgid "Failed to start pairing, error 0x%04x"
681+
msgstr ""
682+
665683
#: ports/nrf/common-hal/bleio/Scanner.c
666684
#, fuzzy, c-format
667685
msgid "Failed to start scanning, err 0x%04x"
@@ -677,12 +695,12 @@ msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
677695
msgid "Failed to write CCCD, err 0x%04x"
678696
msgstr ""
679697

680-
#: ports/nrf/common-hal/bleio/Characteristic.c
698+
#: ports/nrf/common-hal/bleio/__init__.c
681699
#, fuzzy, c-format
682700
msgid "Failed to write attribute value, err 0x%04x"
683701
msgstr "Gagal untuk menulis nilai atribut, status: 0x%08lX"
684702

685-
#: ports/nrf/common-hal/bleio/Characteristic.c
703+
#: ports/nrf/common-hal/bleio/__init__.c
686704
#, fuzzy, c-format
687705
msgid "Failed to write gatts value, err 0x%04x"
688706
msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
@@ -828,10 +846,18 @@ msgstr "Pin-pin tidak valid"
828846
msgid "Invalid polarity"
829847
msgstr ""
830848

849+
#: shared-bindings/bleio/Characteristic.c
850+
msgid "Invalid properties"
851+
msgstr ""
852+
831853
#: shared-bindings/microcontroller/__init__.c
832854
msgid "Invalid run mode."
833855
msgstr ""
834856

857+
#: shared-module/bleio/Attribute.c
858+
msgid "Invalid security_mode"
859+
msgstr ""
860+
835861
#: shared-bindings/audiocore/Mixer.c
836862
msgid "Invalid voice count"
837863
msgstr ""
@@ -950,8 +976,9 @@ msgstr ""
950976
msgid "No such file/directory"
951977
msgstr ""
952978

953-
#: ports/nrf/common-hal/bleio/Characteristic.c
979+
#: ports/nrf/common-hal/bleio/__init__.c shared-bindings/bleio/Central.c
954980
#: shared-bindings/bleio/CharacteristicBuffer.c
981+
#: shared-bindings/bleio/Peripheral.c
955982
#, fuzzy
956983
msgid "Not connected"
957984
msgstr "Tidak dapat menyambungkan ke AP"
@@ -1289,6 +1316,19 @@ msgstr ""
12891316
msgid "Unsupported pull value."
12901317
msgstr ""
12911318

1319+
#: ports/nrf/common-hal/bleio/Characteristic.c
1320+
msgid "Value length required fixed length"
1321+
msgstr ""
1322+
1323+
#: ports/nrf/common-hal/bleio/Descriptor.c
1324+
msgid "Value length != required fixed length"
1325+
msgstr ""
1326+
1327+
#: ports/nrf/common-hal/bleio/Characteristic.c
1328+
#: ports/nrf/common-hal/bleio/Descriptor.c
1329+
msgid "Value length > max_length"
1330+
msgstr ""
1331+
12921332
#: py/emitnative.c
12931333
msgid "Viper functions don't currently support more than 4 arguments"
12941334
msgstr ""
@@ -1388,10 +1428,6 @@ msgstr ""
13881428
msgid "attributes not supported yet"
13891429
msgstr ""
13901430

1391-
#: ports/nrf/common-hal/bleio/Characteristic.c
1392-
msgid "bad GATT role"
1393-
msgstr ""
1394-
13951431
#: py/builtinevex.c
13961432
msgid "bad compile mode"
13971433
msgstr "mode compile buruk"
@@ -1709,6 +1745,10 @@ msgstr ""
17091745
msgid "default 'except' must be last"
17101746
msgstr "'except' standar harus terakhir"
17111747

1748+
#: shared-bindings/bleio/Characteristic.c
1749+
msgid "descriptors includes an object that is not a Descriptors"
1750+
msgstr ""
1751+
17121752
#: shared-bindings/audiobusio/PDMIn.c
17131753
msgid ""
17141754
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
@@ -2048,6 +2088,12 @@ msgstr ""
20482088
msgid "math domain error"
20492089
msgstr ""
20502090

2091+
#: ports/nrf/common-hal/bleio/Characteristic.c
2092+
#: ports/nrf/common-hal/bleio/Descriptor.c
2093+
#, c-format
2094+
msgid "max_length must be 0-%d when fixed_length is %s"
2095+
msgstr ""
2096+
20512097
#: py/runtime.c
20522098
msgid "maximum recursion depth exceeded"
20532099
msgstr ""
@@ -2147,8 +2193,8 @@ msgstr ""
21472193
msgid "non-Service found in services"
21482194
msgstr ""
21492195

2150-
#: ports/nrf/common-hal/bleio/Central.c
2151-
msgid "non-UUID found in service_uuids"
2196+
#: ports/nrf/common-hal/bleio/__init__.c
2197+
msgid "non-UUID found in service_uuids_whitelist"
21522198
msgstr ""
21532199

21542200
#: py/compile.c

‎locale/circuitpython.pot

+59-13
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-05 17:52-0700\n"
11+
"POT-Creation-Date: 2019-08-15 21:44-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 <[email protected]>\n"
@@ -359,7 +359,7 @@ msgid "Can not use dotstar with %s"
359359
msgstr ""
360360

361361
#: ports/nrf/common-hal/bleio/Characteristic.c
362-
msgid "Can't set CCCD for local Characteristic"
362+
msgid "Can't set CCCD on local Characteristic"
363363
msgstr ""
364364

365365
#: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
@@ -423,6 +423,10 @@ msgstr ""
423423
msgid "Characteristic already in use by another Service."
424424
msgstr ""
425425

426+
#: shared-bindings/bleio/Service.c
427+
msgid "Characteristic is already attached to a Service"
428+
msgstr ""
429+
426430
#: shared-bindings/bleio/CharacteristicBuffer.c
427431
msgid "CharacteristicBuffer writing not provided"
428432
msgstr ""
@@ -497,6 +501,10 @@ msgstr ""
497501
msgid "Data too large for advertisement packet"
498502
msgstr ""
499503

504+
#: shared-bindings/bleio/Characteristic.c
505+
msgid "Descriptor is already attached to a Characteristic"
506+
msgstr ""
507+
500508
#: shared-bindings/audiobusio/PDMIn.c
501509
msgid "Destination capacity is smaller than destination_length."
502510
msgstr ""
@@ -590,7 +598,7 @@ msgstr ""
590598
msgid "Failed to continue scanning, err 0x%04x"
591599
msgstr ""
592600

593-
#: ports/nrf/common-hal/bleio/Central.c
601+
#: ports/nrf/common-hal/bleio/__init__.c
594602
msgid "Failed to discover services"
595603
msgstr ""
596604

@@ -607,17 +615,22 @@ msgstr ""
607615
msgid "Failed to notify or indicate attribute value, err 0x%04x"
608616
msgstr ""
609617

618+
#: ports/nrf/common-hal/bleio/Peripheral.c
619+
msgid "Failed to pair"
620+
msgstr ""
621+
610622
#: ports/nrf/common-hal/bleio/Characteristic.c
611623
#, c-format
612624
msgid "Failed to read CCCD value, err 0x%04x"
613625
msgstr ""
614626

615627
#: ports/nrf/common-hal/bleio/Characteristic.c
628+
#: ports/nrf/common-hal/bleio/Descriptor.c
616629
#, c-format
617630
msgid "Failed to read attribute value, err 0x%04x"
618631
msgstr ""
619632

620-
#: ports/nrf/common-hal/bleio/Characteristic.c
633+
#: ports/nrf/common-hal/bleio/__init__.c
621634
#, c-format
622635
msgid "Failed to read gatts value, err 0x%04x"
623636
msgstr ""
@@ -647,6 +660,11 @@ msgstr ""
647660
msgid "Failed to start connecting, error 0x%04x"
648661
msgstr ""
649662

663+
#: ports/nrf/common-hal/bleio/Peripheral.c
664+
#, c-format
665+
msgid "Failed to start pairing, error 0x%04x"
666+
msgstr ""
667+
650668
#: ports/nrf/common-hal/bleio/Scanner.c
651669
#, c-format
652670
msgid "Failed to start scanning, err 0x%04x"
@@ -662,12 +680,12 @@ msgstr ""
662680
msgid "Failed to write CCCD, err 0x%04x"
663681
msgstr ""
664682

665-
#: ports/nrf/common-hal/bleio/Characteristic.c
683+
#: ports/nrf/common-hal/bleio/__init__.c
666684
#, c-format
667685
msgid "Failed to write attribute value, err 0x%04x"
668686
msgstr ""
669687

670-
#: ports/nrf/common-hal/bleio/Characteristic.c
688+
#: ports/nrf/common-hal/bleio/__init__.c
671689
#, c-format
672690
msgid "Failed to write gatts value, err 0x%04x"
673691
msgstr ""
@@ -813,10 +831,18 @@ msgstr ""
813831
msgid "Invalid polarity"
814832
msgstr ""
815833

834+
#: shared-bindings/bleio/Characteristic.c
835+
msgid "Invalid properties"
836+
msgstr ""
837+
816838
#: shared-bindings/microcontroller/__init__.c
817839
msgid "Invalid run mode."
818840
msgstr ""
819841

842+
#: shared-module/bleio/Attribute.c
843+
msgid "Invalid security_mode"
844+
msgstr ""
845+
820846
#: shared-bindings/audiocore/Mixer.c
821847
msgid "Invalid voice count"
822848
msgstr ""
@@ -935,8 +961,9 @@ msgstr ""
935961
msgid "No such file/directory"
936962
msgstr ""
937963

938-
#: ports/nrf/common-hal/bleio/Characteristic.c
964+
#: ports/nrf/common-hal/bleio/__init__.c shared-bindings/bleio/Central.c
939965
#: shared-bindings/bleio/CharacteristicBuffer.c
966+
#: shared-bindings/bleio/Peripheral.c
940967
msgid "Not connected"
941968
msgstr ""
942969

@@ -1265,6 +1292,19 @@ msgstr ""
12651292
msgid "Unsupported pull value."
12661293
msgstr ""
12671294

1295+
#: ports/nrf/common-hal/bleio/Characteristic.c
1296+
msgid "Value length required fixed length"
1297+
msgstr ""
1298+
1299+
#: ports/nrf/common-hal/bleio/Descriptor.c
1300+
msgid "Value length != required fixed length"
1301+
msgstr ""
1302+
1303+
#: ports/nrf/common-hal/bleio/Characteristic.c
1304+
#: ports/nrf/common-hal/bleio/Descriptor.c
1305+
msgid "Value length > max_length"
1306+
msgstr ""
1307+
12681308
#: py/emitnative.c
12691309
msgid "Viper functions don't currently support more than 4 arguments"
12701310
msgstr ""
@@ -1355,10 +1395,6 @@ msgstr ""
13551395
msgid "attributes not supported yet"
13561396
msgstr ""
13571397

1358-
#: ports/nrf/common-hal/bleio/Characteristic.c
1359-
msgid "bad GATT role"
1360-
msgstr ""
1361-
13621398
#: py/builtinevex.c
13631399
msgid "bad compile mode"
13641400
msgstr ""
@@ -1675,6 +1711,10 @@ msgstr ""
16751711
msgid "default 'except' must be last"
16761712
msgstr ""
16771713

1714+
#: shared-bindings/bleio/Characteristic.c
1715+
msgid "descriptors includes an object that is not a Descriptors"
1716+
msgstr ""
1717+
16781718
#: shared-bindings/audiobusio/PDMIn.c
16791719
msgid ""
16801720
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
@@ -2014,6 +2054,12 @@ msgstr ""
20142054
msgid "math domain error"
20152055
msgstr ""
20162056

2057+
#: ports/nrf/common-hal/bleio/Characteristic.c
2058+
#: ports/nrf/common-hal/bleio/Descriptor.c
2059+
#, c-format
2060+
msgid "max_length must be 0-%d when fixed_length is %s"
2061+
msgstr ""
2062+
20172063
#: py/runtime.c
20182064
msgid "maximum recursion depth exceeded"
20192065
msgstr ""
@@ -2112,8 +2158,8 @@ msgstr ""
21122158
msgid "non-Service found in services"
21132159
msgstr ""
21142160

2115-
#: ports/nrf/common-hal/bleio/Central.c
2116-
msgid "non-UUID found in service_uuids"
2161+
#: ports/nrf/common-hal/bleio/__init__.c
2162+
msgid "non-UUID found in service_uuids_whitelist"
21172163
msgstr ""
21182164

21192165
#: py/compile.c

0 commit comments

Comments
 (0)