Skip to content

bleio: add central and scanner functionality, cleanup bleio API, some code restructure #1993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tannewt merged 30 commits into from
Jul 18, 2019
Merged

bleio: add central and scanner functionality, cleanup bleio API, some code restructure #1993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ee81197
WIP
dhalbert May 17, 2019
b71f6c9
Merge remote-tracking branch 'adafruit/master' into ble-scanner
dhalbert May 21, 2019
1639354
Scanner working, but not very first time
dhalbert May 23, 2019
6cec81b
Need to enable ble before scanning
dhalbert May 24, 2019
12f1d9d
fix advertisement length check; add Service.secondary attribute
dhalbert May 31, 2019
63ac379
1. Remove advertising data construction in C: it's all done in Python…
dhalbert Jun 3, 2019
613e12f
Replace Broadcaster with enhanced Peripheral
dhalbert Jun 4, 2019
1905d90
Make advertising data buffers long-lived
dhalbert Jun 6, 2019
6fed24e
WIP
dhalbert Jun 10, 2019
bed6d43
merge from upstream; WIP redo Address; no more AddressType
dhalbert Jun 14, 2019
cfa8b4b
Merge remote-tracking branch 'adafruit/master' into ble-scanner
dhalbert Jun 14, 2019
1356819
Handle None for BLE name; fix ScanEntry bug; compile issue
dhalbert Jun 18, 2019
35b9191
Don't operate directly on bleio objects in shared-bindings: use commo…
dhalbert Jun 19, 2019
a1b5d80
Update copyrights; get ready for Central
dhalbert Jun 19, 2019
24ac1fd
WIP: backup only; not compiled
dhalbert Jun 20, 2019
4881e1f
WIP: Central compiles; now will test
dhalbert Jun 21, 2019
140904e
getting Scanner to work
dhalbert Jun 23, 2019
6ea01ea
Central is connecting; characteristics can be read and written
dhalbert Jun 29, 2019
bf8a35b
WIP: CharacteristicBuffer for Central; not working: need to set remot…
dhalbert Jul 3, 2019
09ddff8
WIP: Need descriptors for Central CCCD discovery; not done yet
dhalbert Jul 7, 2019
118b26b
UARTClient now works both directions
dhalbert Jul 9, 2019
ddd4d61
make translate
dhalbert Jul 9, 2019
6a00178
merge from master
dhalbert Jul 9, 2019
d8a4f71
translation merges
dhalbert Jul 9, 2019
514d414
Fix sphinx warnings.
dhalbert Jul 11, 2019
1cf8a3e
Merge remote-tracking branch 'adafruit/master' into ble-scanner
dhalbert Jul 11, 2019
12b98be
merge from master and make translate
dhalbert Jul 11, 2019
cb99546
update frozen libraries
dhalbert Jul 11, 2019
364ee62
Address review comments.
dhalbert Jul 16, 2019
1c31cf5
sphinx fix
dhalbert Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ["**/build*",
".git",
".venv",
".direnv",
"docs/README.md",
Expand Down
174 changes: 95 additions & 79 deletions locale/ID.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-06-25 17:53-0700\n"
"POT-Creation-Date: 2019-07-09 09:06-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -218,16 +218,15 @@ msgstr ""
msgid "A hardware interrupt channel is already in use"
msgstr "Sebuah channel hardware interrupt sedang digunakan"

#: shared-bindings/bleio/Address.c
#, c-format
msgid "Address is not %d bytes long or is in wrong format"
msgstr ""

#: shared-bindings/bleio/Address.c
#, fuzzy, c-format
msgid "Address must be %d bytes long"
msgstr "buffers harus mempunyai panjang yang sama"

#: shared-bindings/bleio/Address.c
msgid "Address type out of range"
msgstr ""

#: ports/nrf/common-hal/busio/I2C.c
msgid "All I2C peripherals are in use"
msgstr "Semua perangkat I2C sedang digunakan"
Expand Down Expand Up @@ -354,20 +353,8 @@ msgstr ""
msgid "Can not use dotstar with %s"
msgstr ""

#: shared-bindings/bleio/Device.c
msgid "Can't add services in Central mode"
msgstr ""

#: shared-bindings/bleio/Device.c
msgid "Can't advertise in Central mode"
msgstr ""

#: shared-bindings/bleio/Device.c
msgid "Can't change the name in Central mode"
msgstr ""

#: shared-bindings/bleio/Device.c
msgid "Can't connect in Peripheral mode"
#: ports/nrf/common-hal/bleio/Characteristic.c
msgid "Can't set CCCD for local Characteristic"
msgstr ""

#: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
Expand Down Expand Up @@ -502,17 +489,11 @@ msgstr ""
msgid "Data chunk must follow fmt chunk"
msgstr ""

#: ports/nrf/common-hal/bleio/Broadcaster.c
#: ports/nrf/common-hal/bleio/Peripheral.c
#, fuzzy
msgid "Data too large for advertisement packet"
msgstr "Tidak bisa menyesuaikan data ke dalam paket advertisment"

#: ports/nrf/common-hal/bleio/Device.c
#, fuzzy
msgid "Data too large for the advertisement packet"
msgstr "Tidak bisa menyesuaikan data ke dalam paket advertisment"

#: shared-bindings/audiobusio/PDMIn.c
msgid "Destination capacity is smaller than destination_length."
msgstr ""
Expand Down Expand Up @@ -550,6 +531,10 @@ msgstr ""
msgid "Expected a UUID"
msgstr ""

#: shared-bindings/bleio/Central.c
msgid "Expected an Address"
msgstr ""

#: shared-module/_pixelbuf/PixelBuf.c
#, c-format
msgid "Expected tuple of length %d, got %d"
Expand All @@ -559,12 +544,7 @@ msgstr ""
msgid "Failed sending command."
msgstr ""

#: ports/nrf/common-hal/bleio/Device.c
#, fuzzy
msgid "Failed to acquire mutex"
msgstr "Gagal untuk mendapatkan mutex, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Characteristic.c ports/nrf/sd_mutex.c
#: ports/nrf/sd_mutex.c
#, fuzzy, c-format
msgid "Failed to acquire mutex, err 0x%04x"
msgstr "Gagal untuk mendapatkan mutex, status: 0x%08lX"
Expand All @@ -574,11 +554,6 @@ msgstr "Gagal untuk mendapatkan mutex, status: 0x%08lX"
msgid "Failed to add characteristic, err 0x%04x"
msgstr "Gagal untuk menambahkan karakteristik, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Device.c
#, fuzzy
msgid "Failed to add service"
msgstr "Gagal untuk menambahkan layanan, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Peripheral.c
#, fuzzy, c-format
msgid "Failed to add service, err 0x%04x"
Expand All @@ -599,27 +574,21 @@ msgstr "Gagal untuk megalokasikan buffer RX dari %d byte"
msgid "Failed to change softdevice state"
msgstr "Gagal untuk merubah status softdevice, error: 0x%08lX"

#: ports/nrf/common-hal/bleio/Device.c
#, fuzzy
msgid "Failed to connect:"
msgstr "Gagal untuk menyambungkan, status: 0x%08lX"
#: ports/nrf/common-hal/bleio/Peripheral.c
#, c-format
msgid "Failed to configure advertising, err 0x%04x"
msgstr ""

#: ports/nrf/common-hal/bleio/Device.c
#, fuzzy
msgid "Failed to continue scanning"
msgstr "Gagal untuk melanjutkan scanning, status: 0x%08lX"
#: ports/nrf/common-hal/bleio/Central.c
msgid "Failed to connect: timeout"
msgstr ""

#: ports/nrf/common-hal/bleio/Scanner.c
#, fuzzy, c-format
msgid "Failed to continue scanning, err 0x%04x"
msgstr "Gagal untuk melanjutkan scanning, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Device.c
#, fuzzy
msgid "Failed to create mutex"
msgstr "Gagal untuk membuat mutex, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Device.c
#: ports/nrf/common-hal/bleio/Central.c
#, fuzzy
msgid "Failed to discover services"
msgstr "Gagal untuk menemukan layanan, status: 0x%08lX"
Expand Down Expand Up @@ -659,48 +628,41 @@ msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
msgid "Failed to register Vendor-Specific UUID, err 0x%04x"
msgstr "Gagal untuk menambahkan Vendor Spesific UUID, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Device.c
#, fuzzy
msgid "Failed to release mutex"
msgstr "Gagal untuk melepaskan mutex, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Characteristic.c ports/nrf/sd_mutex.c
#: ports/nrf/sd_mutex.c
#, fuzzy, c-format
msgid "Failed to release mutex, err 0x%04x"
msgstr "Gagal untuk melepaskan mutex, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Device.c
#, fuzzy
msgid "Failed to start advertising"
msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
#: ports/nrf/common-hal/bleio/Peripheral.c
#, c-format
msgid "Failed to set device name, err 0x%04x"
msgstr ""

#: ports/nrf/common-hal/bleio/Broadcaster.c
#: ports/nrf/common-hal/bleio/Peripheral.c
#, fuzzy, c-format
msgid "Failed to start advertising, err 0x%04x"
msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Device.c
#, fuzzy
msgid "Failed to start scanning"
msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"
#: ports/nrf/common-hal/bleio/Central.c
#, c-format
msgid "Failed to start connecting, error 0x%04x"
msgstr ""

#: ports/nrf/common-hal/bleio/Scanner.c
#, fuzzy, c-format
msgid "Failed to start scanning, err 0x%04x"
msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Device.c
#, fuzzy
msgid "Failed to stop advertising"
msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Broadcaster.c
#: ports/nrf/common-hal/bleio/Peripheral.c
#, fuzzy, c-format
msgid "Failed to stop advertising, err 0x%04x"
msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"

#: ports/nrf/common-hal/bleio/Characteristic.c
#, c-format
msgid "Failed to write CCCD, err 0x%04x"
msgstr ""

#: ports/nrf/common-hal/bleio/Characteristic.c
#, fuzzy, c-format
msgid "Failed to write attribute value, err 0x%04x"
Expand Down Expand Up @@ -916,6 +878,10 @@ msgstr ""
msgid "Must be a %q subclass."
msgstr ""

#: ports/nrf/common-hal/bleio/Characteristic.c
msgid "No CCCD for this Characteristic"
msgstr ""

#: ports/atmel-samd/common-hal/analogio/AnalogOut.c
msgid "No DAC on chip"
msgstr "Tidak ada DAC (Digital Analog Converter) di dalam chip"
Expand Down Expand Up @@ -966,6 +932,7 @@ msgstr ""
msgid "No such file/directory"
msgstr ""

#: ports/nrf/common-hal/bleio/Characteristic.c
#: shared-bindings/bleio/CharacteristicBuffer.c
#, fuzzy
msgid "Not connected"
Expand Down Expand Up @@ -1229,7 +1196,7 @@ msgid "USB Error"
msgstr ""

#: shared-bindings/bleio/UUID.c
msgid "UUID integer value not in range 0 to 0xffff"
msgid "UUID integer value must be 0-0xffff"
msgstr ""

#: shared-bindings/bleio/UUID.c
Expand Down Expand Up @@ -1928,8 +1895,9 @@ msgstr ""
msgid "integer required"
msgstr ""

#: ports/nrf/common-hal/bleio/Broadcaster.c
msgid "interval not in range 0.0020 to 10.24"
#: shared-bindings/bleio/Peripheral.c shared-bindings/bleio/Scanner.c
#, c-format
msgid "interval must be in range %s-%s"
msgstr ""

#: extmod/machine_i2c.c
Expand Down Expand Up @@ -2144,6 +2112,14 @@ msgstr "tidak ada modul yang bernama '%q'"
msgid "no such attribute"
msgstr ""

#: shared-bindings/bleio/Peripheral.c
msgid "non-Service found in services"
msgstr ""

#: ports/nrf/common-hal/bleio/Central.c
msgid "non-UUID found in service_uuids"
msgstr ""

#: py/compile.c
msgid "non-default argument follows default argument"
msgstr "argumen non-default mengikuti argumen standar(default)"
Expand Down Expand Up @@ -2353,10 +2329,6 @@ msgstr ""
msgid "script compilation not supported"
msgstr "kompilasi script tidak didukung"

#: shared-bindings/bleio/Peripheral.c
msgid "services includes an object that is not a Service"
msgstr ""

#: py/objstr.c
msgid "sign not allowed in string format specifier"
msgstr ""
Expand Down Expand Up @@ -2624,6 +2596,10 @@ msgstr ""
msgid "value_count must be > 0"
msgstr ""

#: shared-bindings/bleio/Scanner.c
msgid "window must be <= interval"
msgstr ""

#: shared-bindings/_pixelbuf/PixelBuf.c
msgid "write_args must be a list, tuple, or None"
msgstr ""
Expand Down Expand Up @@ -2670,6 +2646,10 @@ msgstr ""
#~ msgid "Cannot update i/f status"
#~ msgstr "Tidak dapat memperbarui status i/f"

#, fuzzy
#~ msgid "Data too large for the advertisement packet"
#~ msgstr "Tidak bisa menyesuaikan data ke dalam paket advertisment"

#~ msgid "Don't know how to pass object to native function"
#~ msgstr "Tidak tahu cara meloloskan objek ke fungsi native"

Expand All @@ -2682,6 +2662,26 @@ msgstr ""
#~ msgid "Error in ffi_prep_cif"
#~ msgstr "Errod pada ffi_prep_cif"

#, fuzzy
#~ msgid "Failed to acquire mutex"
#~ msgstr "Gagal untuk mendapatkan mutex, status: 0x%08lX"

#, fuzzy
#~ msgid "Failed to add service"
#~ msgstr "Gagal untuk menambahkan layanan, status: 0x%08lX"

#, fuzzy
#~ msgid "Failed to connect:"
#~ msgstr "Gagal untuk menyambungkan, status: 0x%08lX"

#, fuzzy
#~ msgid "Failed to continue scanning"
#~ msgstr "Gagal untuk melanjutkan scanning, status: 0x%08lX"

#, fuzzy
#~ msgid "Failed to create mutex"
#~ msgstr "Gagal untuk membuat mutex, status: 0x%08lX"

#, fuzzy
#~ msgid "Failed to notify or indicate attribute value, err %0x04x"
#~ msgstr "Gagal untuk melaporkan nilai atribut, status: 0x%08lX"
Expand All @@ -2690,6 +2690,22 @@ msgstr ""
#~ msgid "Failed to read attribute value, err %0x04x"
#~ msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX"

#, fuzzy
#~ msgid "Failed to release mutex"
#~ msgstr "Gagal untuk melepaskan mutex, status: 0x%08lX"

#, fuzzy
#~ msgid "Failed to start advertising"
#~ msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"

#, fuzzy
#~ msgid "Failed to start scanning"
#~ msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"

#, fuzzy
#~ msgid "Failed to stop advertising"
#~ msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"

#~ msgid "GPIO16 does not support pull up."
#~ msgstr "GPIO16 tidak mendukung pull up"

Expand Down
Loading