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

some speed tweaks to hidconsole batch mode

This commit is contained in:
Daniel Pavel 2012-11-24 22:48:31 +02:00
parent 13a11e78f0
commit 5b8c983ab3
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/hidapi/hidconsole.py
View File

@ -5,7 +5,7 @@ import sys
from select import select as _select from select import select as _select
import time import time
from binascii import hexlify, unhexlify from binascii import hexlify, unhexlify
_hex = lambda d: hexlify(d).decode('ascii').upper() strhex = lambda d: hexlify(d).decode('ascii').upper()
interactive = os.isatty(0) interactive = os.isatty(0)
@ -24,7 +24,7 @@ def _print(marker, data, scroll=False):
sys.stdout.write('\033[S') # scroll up sys.stdout.write('\033[S') # scroll up
sys.stdout.write('\033[A\033[L\033[G') # insert new line above the current one, position on first column sys.stdout.write('\033[A\033[L\033[G') # insert new line above the current one, position on first column
hexs = _hex(data) hexs = strhex(data)
s = '%s (% 8.3f) [%s %s %s %s] %s' % (marker, t, hexs[0:2], hexs[2:4], hexs[4:8], hexs[8:], repr(data)) s = '%s (% 8.3f) [%s %s %s %s] %s' % (marker, t, hexs[0:2], hexs[2:4], hexs[4:8], hexs[8:], repr(data))
sys.stdout.write(s) sys.stdout.write(s)
@ -34,7 +34,7 @@ def _print(marker, data, scroll=False):
sys.stdout.write('\n') sys.stdout.write('\n')
def _continuous_read(handle, timeout=1000): def _continuous_read(handle, timeout=2000):
while True: while True:
reply = hidapi.read(handle, 128, timeout) reply = hidapi.read(handle, 128, timeout)
if reply is None: if reply is None:
@ -95,8 +95,13 @@ if __name__ == '__main__':
hidapi.write(handle, data) hidapi.write(handle, data)
# wait for some kind of reply # wait for some kind of reply
if not interactive: if not interactive:
rlist, wlist, xlist = _select([handle], [], [], 1) if data[1:2] == b'\xFF':
time.sleep(0.1) # the receiver will reply very fast, in a few milliseconds
time.sleep(0.010)
else:
# the devices might reply quite slow
rlist, wlist, xlist = _select([handle], [], [], 1)
time.sleep(0.050)
except EOFError: except EOFError:
pass pass
except Exception as e: except Exception as e:

17
lib/logitech/unifying_receiver/tests/test_00_hidapi.py
View File

@ -1,17 +0,0 @@
#
# test loading the hidapi library
#
import logging
import unittest
class Test_Import_HIDAPI(unittest.TestCase):
def test_00_import_hidapi(self):
import hidapi
self.assertIsNotNone(hidapi)
logging.info("hidapi loaded native implementation %s", hidapi.native_implementation)
if __name__ == '__main__':
unittest.main()