srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

devices/thorlabs_tcube: improve debug logging

This commit is contained in:
Sebastien Bourdeauducq 2015-11-25 15:28:34 +08:00
parent 3c0efb3ad5
commit 178f3cd815
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/devices/thorlabs_tcube/driver.py
View File

@ -142,6 +142,12 @@ class Message:
self.src = src self.src = src
self.data = data self.data = data
def __str__(self):
return ("<Message {} p1=0x{:02x} p2=0x{:02x} "
"dest=0x{:02x} src=0x{:02x}>".format(
self.id, self.param1, self.param2,
self.dest, self.src))
@staticmethod @staticmethod
def unpack(data): def unpack(data):
id, param1, param2, dest, src = st.unpack("<HBBBB", data[:6]) id, param1, param2, dest, src = st.unpack("<HBBBB", data[:6])
@ -163,16 +169,20 @@ class Message:
self.param1, self.param2, self.dest, self.src) self.param1, self.param2, self.dest, self.src)
def send(self, port): def send(self, port):
logger.debug("sending: %s", self)
port.write(self.pack()) port.write(self.pack())
@classmethod @classmethod
def recv(cls, port): def recv(cls, port):
(header, ) = st.unpack("6s", port.read(6)) (header, ) = st.unpack("6s", port.read(6))
logger.debug("received header: %s", header)
data = b"" data = b""
if header[4] & 0x80: if header[4] & 0x80:
(length, ) = st.unpack("<H", header[2:4]) (length, ) = st.unpack("<H", header[2:4])
data = port.read(length) data = port.read(length)
return cls.unpack(header + data) r = cls.unpack(header + data)
logger.debug("receiving: %s", r)
return r
@property @property
def has_data(self): def has_data(self):