RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better matching of task replies

This commit is contained in:
Daniel Pavel 2012-11-07 21:29:06 +02:00
parent f172ceebd1
commit 89205f0bbc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/logitech/unifying_receiver/listener.py
View File

@ -83,14 +83,10 @@ class EventsListener(_Thread):
matched = False matched = False
task = None if self._tasks.empty() else self._tasks.queue[0] task = None if self._tasks.empty() else self._tasks.queue[0]
if task and task[-1] is None: if task and task[-1] is None:
devnumber, data = task[:2] task_dev, task_data = task[:2]
if event[1] == devnumber: if event[1] == task_dev:
# _log.debug("matching %s to %d, %s", event, devnumber, repr(data)) _log.debug("matching %s to (%d, %s)", event, task_dev, repr(task_data))
if event[0] == 0x11 or (event[0] == 0x10 and devnumber == 0xFF): matched = event[2][:2] == task_data[:2] or (event[2][:1] in b'\x8F\xFF' and event[2][1:3] == task_data[:2])
matched = (event[2][:2] == data[:2]) or (event[2][:1] == b'\xFF' and event[2][1:3] == data[:2])
elif event[0] == 0x10:
if event[2][:1] == b'\x8F' and event[2][1:3] == data[:2]:
matched = True
if matched: if matched:
# _log.debug("request reply %s", event) # _log.debug("request reply %s", event)