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

defer the creation of the wacom device object 

If bluez is restarted, the services are not resolved.
If the data has not been connected, the manufacturerData might be
correctly set, but the services are still not resolved, meaning that
we can not start listening on the various GATT characteristics.

Defer the creation of the wacom device object after connect, when
we are sure the services are resolved.
This commit is contained in:
Benjamin Tissoires 2018-01-19 17:30:34 +01:00 committed by Peter Hutterer
parent 3e5ef6c939
commit 56dc8741dc
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tuhi.py
View File

@ -81,15 +81,12 @@ class TuhiDevice(GObject.Object):
GObject.Object.__init__(self)
self.config = config
self._tuhi_dbus_device = tuhi_dbus_device
self._wacom_device = WacomDevice(bluez_device, uuid)
self._wacom_device.connect('drawing', self._on_drawing_received)
self._wacom_device.connect('done', self._on_fetching_finished, bluez_device)
self._wacom_device.connect('button-press-required', self._on_button_press_required)
self._wacom_device.connect('notify::uuid', self._on_uuid_updated, bluez_device)
self._wacom_device = None
self.drawings = []
# We need either uuid or paired as false
assert uuid is not None or paired is False
self.paired = paired
self._uuid = uuid
bluez_device.connect('connected', self._on_bluez_device_connected)
bluez_device.connect('disconnected', self._on_bluez_device_disconnected)
@ -102,6 +99,13 @@ class TuhiDevice(GObject.Object):
def _on_bluez_device_connected(self, bluez_device):
logger.debug('{}: connected'.format(bluez_device.address))
if self._wacom_device is None:
self._wacom_device = WacomDevice(bluez_device, self._uuid)
self._wacom_device.connect('drawing', self._on_drawing_received)
self._wacom_device.connect('done', self._on_fetching_finished, bluez_device)
self._wacom_device.connect('button-press-required', self._on_button_press_required)
self._wacom_device.connect('notify::uuid', self._on_uuid_updated, bluez_device)
self._wacom_device.start(not self.paired)
self.pairing_mode = False