From 1891fcb1bba3693147b50cf46246c414535de036 Mon Sep 17 00:00:00 2001 From: Cedric Beauduffe Date: Sun, 13 Mar 2016 03:39:05 +0100 Subject: [PATCH] Add timeout on ep.write --- usbtmc/usbtmc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usbtmc/usbtmc.py b/usbtmc/usbtmc.py index 0c642a6..cbccb8c 100644 --- a/usbtmc/usbtmc.py +++ b/usbtmc/usbtmc.py @@ -480,7 +480,7 @@ def write_raw(self, data): size = len(block) req = self.pack_dev_dep_msg_out_header(size, eom) + block + b'\0'*((4 - (size % 4)) % 4) - self.bulk_out_ep.write(req) + self.bulk_out_ep.write(req, timeout = int(self.timeout*1000)) offset += size num -= size @@ -511,7 +511,7 @@ def read_raw(self, num=-1): # so only send it the first time req = self.pack_dev_dep_msg_in_header(read_len, term_char) - self.bulk_out_ep.write(req) + self.bulk_out_ep.write(req, timeout = int(self.timeout*1000)) resp = self.bulk_in_ep.read(read_len+USBTMC_HEADER_SIZE+3, timeout = int(self.timeout*1000)) @@ -657,7 +657,7 @@ def trigger(self): if self.support_trigger: data = self.pack_usb488_trigger() print(repr(data)) - self.bulk_out_ep.write(data) + self.bulk_out_ep.write(data, timeout = int(self.timeout*1000)) else: self.write("*TRG")