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

base: drop the extra function for checking if the device is in register mode 

Now that it's just a one-liner, we don't need an extra function
This commit is contained in:
Peter Hutterer 2019-07-17 10:06:37 +10:00
parent 37b9b2eefa
commit 08e3ec532e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tuhi/base.py
View File

@ -331,13 +331,6 @@ class Tuhi(GObject.Object):
for addr in unregistered: for addr in unregistered:
del self.devices[addr] del self.devices[addr]
@classmethod
def _device_in_register_mode(cls, bluez_device):
# When the device is in register mode (blue light blinking), the
# manufacturer is merely 4 bytes. This will reset to 7 bytes even
# when the device simply times out and does not register fully.
return len(bluez_device.manufacturer_data or []) == 4
def _on_bluez_discovery_started(self, manager): def _on_bluez_discovery_started(self, manager):
# Something else may turn discovery mode on, we don't care about # Something else may turn discovery mode on, we don't care about
# it then # it then
@ -380,7 +373,11 @@ class Tuhi(GObject.Object):
# if we got here from a currently live BlueZ device, # if we got here from a currently live BlueZ device,
# ManufacturerData is reliable. Else, consider the device not in # ManufacturerData is reliable. Else, consider the device not in
# register mode # register mode
if from_live_update and Tuhi._device_in_register_mode(bluez_device): #
# When the device is in register mode (blue light blinking), the
# manufacturer is merely 4 bytes. This will reset to 7 bytes even
# when the device simply times out and does not register fully.
if from_live_update and len(bluez_device.manufacturer_data or []) == 4:
mode = DeviceMode.REGISTER mode = DeviceMode.REGISTER
else: else:
mode = DeviceMode.LISTEN mode = DeviceMode.LISTEN