From 75fda5df84f6a0d8c6872e1f82f91a404c255113 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Wed, 11 May 2022 18:13:43 +0200 Subject: [PATCH] gattlib-py: Rename 'id' attribute into 'mac_address' --- gattlib-py/examples/ble_scan/ble_scan.py | 2 +- gattlib-py/examples/find_eddystone/find_eddystone.py | 6 +++--- gattlib-py/gattlib/device.py | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gattlib-py/examples/ble_scan/ble_scan.py b/gattlib-py/examples/ble_scan/ble_scan.py index 87ed141..f6768c2 100755 --- a/gattlib-py/examples/ble_scan/ble_scan.py +++ b/gattlib-py/examples/ble_scan/ble_scan.py @@ -24,7 +24,7 @@ def connect_ble_device(device): lock.acquire() print("---------------------------------") - print(f"Found BLE Device {device.id}. Connection tentative...") + print(f"Found BLE Device {device.mac_address}. Connection tentative...") device.discover() for key, val in device.characteristics.items(): diff --git a/gattlib-py/examples/find_eddystone/find_eddystone.py b/gattlib-py/examples/find_eddystone/find_eddystone.py index f47aa99..dae3b6f 100755 --- a/gattlib-py/examples/find_eddystone/find_eddystone.py +++ b/gattlib-py/examples/find_eddystone/find_eddystone.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: BSD-3-Clause # -# Copyright (c) 2016-2021, Olivier Martin +# Copyright (c) 2016-2022, Olivier Martin # import argparse @@ -19,8 +19,8 @@ default_adapter = adapter.Adapter() def on_eddystone_device_found(device, advertisement_data, manufacturer_id, manufacturer_data, user_data): - rssi = default_adapter.get_rssi_from_mac(device.id) - print("Find Eddystone device %s (RSSI:%d)" % (device.id, rssi)) + rssi = default_adapter.get_rssi_from_mac(device.mac_address) + print("Find Eddystone device %s (RSSI:%d)" % (device.mac_address, rssi)) # Service Data eddystone_data = advertisement_data[adapter.EDDYSTONE_COMMON_DATA_UUID] diff --git a/gattlib-py/gattlib/device.py b/gattlib-py/gattlib/device.py index f1df317..e3d8d9a 100644 --- a/gattlib-py/gattlib/device.py +++ b/gattlib-py/gattlib/device.py @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: BSD-3-Clause # -# Copyright (c) 2016-2021, Olivier Martin +# Copyright (c) 2016-2022, Olivier Martin # import logging @@ -42,7 +42,8 @@ class Device: self._gatt_characteristic_callbacks = {} @property - def id(self): + def mac_address(self): + """Return Device MAC Address""" return self._addr.decode("utf-8") @property