alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'esp_prov/update_deprecation_warnings' into 'master'

Browse Source 
fix(esp_prov): Fixed the deprecation APIs warnings

See merge request espressif/esp-idf!24896
This commit is contained in:
Aditya Patwardhan 2023-07-28 16:24:09 +08:00
commit 22d98c2c35
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/esp_prov/transport/ble_cli.py
View File

@ -21,7 +21,7 @@ except ImportError:
# -------------------------------------------------------------------- # --------------------------------------------------------------------
def device_sort(device): def device_sort(device):
return device.address return device[0].address
class BLE_Bleak_Client: class BLE_Bleak_Client:
@ -46,7 +46,8 @@ class BLE_Bleak_Client:
print('Discovering...') print('Discovering...')
try: try:
devices = await bleak.BleakScanner.discover() discovery = await bleak.BleakScanner.discover(return_adv=True)
devices = list(discovery.values())
except bleak.exc.BleakDBusError as e: except bleak.exc.BleakDBusError as e:
if str(e) == '[org.bluez.Error.NotReady] Resource Not Ready': if str(e) == '[org.bluez.Error.NotReady] Resource Not Ready':
raise RuntimeError('Bluetooth is not ready. Maybe try `bluetoothctl power on`?') raise RuntimeError('Bluetooth is not ready. Maybe try `bluetoothctl power on`?')
@ -65,7 +66,7 @@ class BLE_Bleak_Client:
print('{0: >4} {1: <33} {2: <12}'.format( print('{0: >4} {1: <33} {2: <12}'.format(
'S.N.', 'Name', 'Address')) 'S.N.', 'Name', 'Address'))
for i, _ in enumerate(devices): for i, _ in enumerate(devices):
print('[{0: >2}] {1: <33} {2: <12}'.format(i + 1, devices[i].name or 'Unknown', devices[i].address)) print('[{0: >2}] {1: <33} {2: <12}'.format(i + 1, devices[i][0].name or 'Unknown', devices[i][0].address))
while True: while True:
try: try:
@ -79,10 +80,11 @@ class BLE_Bleak_Client:
if select != 0: if select != 0:
break break
devices = await bleak.BleakScanner.discover() discovery = await bleak.BleakScanner.discover(return_adv=True)
devices = list(discovery.values())
self.devname = devices[select - 1].name self.devname = devices[select - 1][0].name
found_device = devices[select - 1] found_device = devices[select - 1][0]
else: else:
for d in devices: for d in devices:
if d.name == self.devname: if d.name == self.devname:
@ -91,7 +93,7 @@ class BLE_Bleak_Client:
if not found_device: if not found_device:
raise RuntimeError('Device not found') raise RuntimeError('Device not found')
uuids = found_device.metadata['uuids'] uuids = devices[select - 1][1].service_uuids
# There should be 1 service UUID in advertising data # There should be 1 service UUID in advertising data
# If bluez had cached an old version of the advertisement data # If bluez had cached an old version of the advertisement data
# the list of uuids may be incorrect, in which case connection # the list of uuids may be incorrect, in which case connection
@ -109,7 +111,7 @@ class BLE_Bleak_Client:
await self.device.pair() await self.device.pair()
print('Getting Services...') print('Getting Services...')
services = await self.device.get_services() services = self.device.services
service = services[self.srv_uuid_adv] or services[self.srv_uuid_fallback] service = services[self.srv_uuid_adv] or services[self.srv_uuid_fallback]
if not service: if not service: