import Queue exception handling
parent
8eb86f1c75
commit
e5520e5ef7
|
@ -8,11 +8,14 @@ from binascii import hexlify
|
|||
SCAN_TIMEOUT = 3
|
||||
|
||||
|
||||
import Queue
|
||||
try:
|
||||
import queue
|
||||
except ImportError:
|
||||
import Queue as queue
|
||||
|
||||
class Fifo():
|
||||
def __init__(self):
|
||||
self.q = Queue.Queue()
|
||||
self.q = queue.Queue()
|
||||
|
||||
def write(self, data): # put bytes
|
||||
for b in data:
|
||||
|
@ -49,7 +52,7 @@ class BLELink(BaseLink):
|
|||
def __exit__(self, exc_type, exc_value, traceback):
|
||||
self.close()
|
||||
|
||||
|
||||
|
||||
def _make_rx_cb(self): # this is a closure :)
|
||||
def rx_cb(handle, value):
|
||||
self._rx_fifo.write(value)
|
||||
|
@ -72,7 +75,7 @@ class BLELink(BaseLink):
|
|||
self._wr_handle = self._dev.get_handle(_rx_char_uuid)
|
||||
except pygatt.exceptions.NotConnectedError:
|
||||
raise LinkOpenException
|
||||
|
||||
|
||||
|
||||
def close(self):
|
||||
if self._dev:
|
||||
|
@ -85,7 +88,7 @@ class BLELink(BaseLink):
|
|||
def read(self, size):
|
||||
try:
|
||||
data = self._rx_fifo.read(size, timeout=self.timeout)
|
||||
except Queue.Empty:
|
||||
except queue.Empty:
|
||||
raise LinkTimeoutException
|
||||
if self.dump:
|
||||
print '<', hexlify(data).upper()
|
||||
|
|
|
@ -8,11 +8,14 @@ from binascii import hexlify
|
|||
SCAN_TIMEOUT = 3
|
||||
|
||||
|
||||
import Queue
|
||||
try:
|
||||
import queue
|
||||
except ImportError:
|
||||
import Queue as queue
|
||||
|
||||
class Fifo():
|
||||
def __init__(self):
|
||||
self.q = Queue.Queue()
|
||||
self.q = queue.Queue()
|
||||
|
||||
def write(self, data): # put bytes
|
||||
for b in data:
|
||||
|
@ -84,7 +87,7 @@ class BLELink(BaseLink):
|
|||
def read(self, size):
|
||||
try:
|
||||
data = self._rx_fifo.read(size, timeout=self.timeout)
|
||||
except Queue.Empty:
|
||||
except queue.Empty:
|
||||
raise LinkTimeoutException
|
||||
if self.dump:
|
||||
print '<', hexlify(data).upper()
|
||||
|
|
Loading…
Reference in New Issue