PyUSB backend: specify both timeouts in ms

This commit is contained in:
Philipp Klaus
2016-12-17 20:18:56 +01:00
parent 6173a4a470
commit 15788ccbe6
+3 -3
View File
@@ -63,7 +63,7 @@ class BrotherQLBackendPyUSB(BrotherQLBackendGeneric):
""" """
self.dev = None self.dev = None
self.read_timeout = 0.01 self.read_timeout = 10. # ms
self.write_timeout = 5000. # ms self.write_timeout = 5000. # ms
# strategy : try_twice or select # strategy : try_twice or select
self.strategy = 'try_twice' self.strategy = 'try_twice'
@@ -122,12 +122,12 @@ class BrotherQLBackendPyUSB(BrotherQLBackendGeneric):
if data: if data:
return bytes(data) return bytes(data)
else: else:
time.sleep(self.read_timeout) time.sleep(self.read_timeout/1000.)
return self._raw_read(length) return self._raw_read(length)
elif self.strategy == 'select': elif self.strategy == 'select':
data = b'' data = b''
start = time.time() start = time.time()
while (not data) and (time.time() - start < self.read_timeout): while (not data) and (time.time() - start < self.read_timeout/1000.):
result, _, _ = select.select([self.read_dev], [], [], 0) result, _, _ = select.select([self.read_dev], [], [], 0)
if self.read_dev in result: if self.read_dev in result:
data += self._raw_read(length) data += self._raw_read(length)