Handle device name char separately.

Fixes part of hbldh#104.
lincaiwei · Sep 7, 2019 · 4b9b93c · 4b9b93c
1 parent 749f27c
commit 4b9b93c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,7 @@
 * bleak version:
 * Python version:
 * Operating System:
+* BlueZ version (`bluetoothctl -v`) in case of Linux: 
 
 ### Description
 

diff --git a/bleak/backends/bluezdbus/client.py b/bleak/backends/bluezdbus/client.py
@@ -295,6 +295,21 @@ async def read_gatt_char(self, _uuid: str, **kwargs) -> bytearray:
                     )
                 )
                 return value
+            if _uuid == '00002a00-0000-1000-8000-00805f9b34fb' and (
+                self._bluez_version[0] == 5 and self._bluez_version[1] >= 48
+            ):
+                props = await self._get_device_properties(
+                    interface=defs.DEVICE_INTERFACE
+                )
+                # Simulate regular characteristics read to be consistent over all platforms.
+                value = bytearray(props.get("Name", "").encode('ascii'))
+                logger.debug(
+                    "Read Device Name {0} | {1}: {2}".format(
+                        _uuid, self._device_path, value
+                    )
+                )
+                return value
+
             raise BleakError(
                 "Characteristic with UUID {0} could not be found!".format(_uuid)
             )

diff --git a/examples/sensortag.py b/examples/sensortag.py
@@ -69,6 +69,9 @@
 MODEL_NBR_UUID = "0000{0:x}-0000-1000-8000-00805f9b34fb".format(
     uuid16_dict.get("Model Number String")
 )
+DEVICE_NAME_UUID = "0000{0:x}-0000-1000-8000-00805f9b34fb".format(
+    uuid16_dict.get("Device Name")
+)
 FIRMWARE_REV_UUID = "0000{0:x}-0000-1000-8000-00805f9b34fb".format(
     uuid16_dict.get("Firmware Revision String")
 )
@@ -94,12 +97,12 @@ async def run(address, loop, debug=False):
     if debug:
         import sys
 
-        loop.set_debug(True)
-        l = logging.getLogger("asyncio")
-        l.setLevel(logging.DEBUG)
-        h = logging.StreamHandler(sys.stdout)
-        h.setLevel(logging.DEBUG)
-        l.addHandler(h)
+        # loop.set_debug(True)
+        # l = logging.getLogger("asyncio")
+        # l.setLevel(logging.DEBUG)
+        # h = logging.StreamHandler(sys.stdout)
+        # h.setLevel(logging.DEBUG)
+        # l.addHandler(h)
 
     async with BleakClient(address, loop=loop) as client:
         x = await client.is_connected()
@@ -115,6 +118,9 @@ async def run(address, loop, debug=False):
         model_number = await client.read_gatt_char(MODEL_NBR_UUID)
         print("Model Number: {0}".format("".join(map(chr, model_number))))
 
+        device_name = await client.read_gatt_char(DEVICE_NAME_UUID)
+        print("Device Name: {0}".format("".join(map(chr, device_name))))
+
         manufacturer_name = await client.read_gatt_char(MANUFACTURER_NAME_UUID)
         print("Manufacturer Name: {0}".format("".join(map(chr, manufacturer_name))))