nixo
/
tuhi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ble: use ServicesResolved for the connected signal

This commit is contained in:
Peter Hutterer 2018-01-17 11:34:54 +10:00 committed by Benjamin Tissoires
parent f30f47d454
commit dde2ad4b46
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tuhi/ble.py
View File

@ -114,8 +114,7 @@ class BlueZDevice(GObject.Object):
self.characteristics = {} self.characteristics = {}
self.resolve(om) self.resolve(om)
self.interface.connect('g-properties-changed', self._on_properties_changed) self.interface.connect('g-properties-changed', self._on_properties_changed)
# FIXME: this should switch to ServicesResolved if self.connected:
if self.interface.get_cached_property('Connected').get_boolean():
self.emit('connected') self.emit('connected')
@property @property
@ -137,6 +136,11 @@ class BlueZDevice(GObject.Object):
return md.keys()[0] return md.keys()[0]
return None return None
@property
def connected(self):
return (self.interface.get_cached_property('Connected').unpack() and
self.interface.get_cached_property('ServicesResolved').unpack())
def resolve(self, om): def resolve(self, om):
""" """
Resolve the GattServices and GattCharacteristics. This function does Resolve the GattServices and GattCharacteristics. This function does
@ -186,9 +190,8 @@ class BlueZDevice(GObject.Object):
asynchronous and returns immediately. asynchronous and returns immediately.
""" """
i = self.obj.get_interface(ORG_BLUEZ_DEVICE1) i = self.obj.get_interface(ORG_BLUEZ_DEVICE1)
if i.get_cached_property('Connected').get_boolean(): if self.connected:
logger.info('{}: Device is already connected'.format(self.address)) logger.info('{}: Device is already connected'.format(self.address))
# FIXME: this should switch to ServicesResolved
self.emit('connected') self.emit('connected')
return return
@ -205,10 +208,12 @@ class BlueZDevice(GObject.Object):
if 'Connected' in properties: if 'Connected' in properties:
if properties['Connected']: if properties['Connected']:
logger.info('Connection established') logger.info('Connection established')
self.emit('connected')
else: else:
logger.info('Disconnected') logger.info('Disconnected')
self.emit('disconnected') self.emit('disconnected')
elif 'ServicesResolved' in properties:
if properties['ServicesResolved']:
self.emit('connected')
def connect_gatt_value(self, uuid, callback): def connect_gatt_value(self, uuid, callback):
""" """