mirror
/
micropython-lib
kopia lustrzana https://github.com/micropython/micropython-lib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

aioble: Fix descriptor flag handling. 

Removes the workaround for micropython/issues/6864.

Sets the default flags for discovered descriptors to be WRITE,
so that d.write() will implicitly set response=True.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
pull/643/head v1.20.0
Jim Mussared 2023-04-12 00:48:31 +10:00
rodzic 01db3da37e
commit c113611765
5 zmienionych plików z 6 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
micropython/bluetooth/aioble-client/manifest.py
Wyświetl plik

@ -1,4 +1,4 @@
metadata(version="0.2.0") metadata(version="0.3.0")
require("aioble-core") require("aioble-core")

2
micropython/bluetooth/aioble-server/manifest.py
Wyświetl plik

@ -1,4 +1,4 @@
metadata(version="0.2.0") metadata(version="0.3.0")
require("aioble-core") require("aioble-core")

2
micropython/bluetooth/aioble/aioble/client.py
Wyświetl plik

@ -439,7 +439,7 @@ class ClientDescriptor(BaseClientCharacteristic):
def __init__(self, characteristic, dsc_handle, uuid): def __init__(self, characteristic, dsc_handle, uuid):
self.characteristic = characteristic self.characteristic = characteristic
super().__init__(dsc_handle, _FLAG_READ | _FLAG_WRITE_NO_RESPONSE, uuid) super().__init__(dsc_handle, _FLAG_READ | _FLAG_WRITE, uuid)
def __str__(self): def __str__(self):
return "Descriptor: {} {} {}".format(self._value_handle, self.properties, self.uuid) return "Descriptor: {} {} {}".format(self._value_handle, self.properties, self.uuid)

8
micropython/bluetooth/aioble/aioble/server.py
Wyświetl plik

@ -38,9 +38,6 @@ _FLAG_WRITE_AUTHORIZED = const(0x4000)
_FLAG_WRITE_CAPTURE = const(0x10000) _FLAG_WRITE_CAPTURE = const(0x10000)
_FLAG_DESC_READ = const(1)
_FLAG_DESC_WRITE = const(2)
_WRITE_CAPTURE_QUEUE_LIMIT = const(10) _WRITE_CAPTURE_QUEUE_LIMIT = const(10)
@ -307,14 +304,13 @@ class Descriptor(BaseCharacteristic):
def __init__(self, characteristic, uuid, read=False, write=False, initial=None): def __init__(self, characteristic, uuid, read=False, write=False, initial=None):
characteristic.descriptors.append(self) characteristic.descriptors.append(self)
# Workaround for https://github.com/micropython/micropython/issues/6864
flags = 0 flags = 0
if read: if read:
flags |= _FLAG_DESC_READ flags |= _FLAG_READ
if write: if write:
flags |= _FLAG_WRITE
self._write_event = asyncio.ThreadSafeFlag() self._write_event = asyncio.ThreadSafeFlag()
self._write_data = None self._write_data = None
flags |= _FLAG_DESC_WRITE
self.uuid = uuid self.uuid = uuid
self.flags = flags self.flags = flags

2
micropython/bluetooth/aioble/manifest.py
Wyświetl plik

@ -3,7 +3,7 @@
# code. This allows (for development purposes) all the files to live in the # code. This allows (for development purposes) all the files to live in the
# one directory. # one directory.
metadata(version="0.2.1") metadata(version="0.3.1")
# Default installation gives you everything. Install the individual # Default installation gives you everything. Install the individual
# components (or a combination of them) if you want a more minimal install. # components (or a combination of them) if you want a more minimal install.