M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

comm_analyzer: make header error flag more general

This commit is contained in:
Sebastien Bourdeauducq 2020-07-20 19:39:19 +08:00
parent 553a49e194
commit 2a2f5c4d58
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/coredevice/comm_analyzer.py
View File

@ -92,16 +92,16 @@ DecodedDump = namedtuple(
def decode_dump(data): def decode_dump(data):
parts = struct.unpack(">IQbbb", data[:15]) parts = struct.unpack(">IQbbb", data[:15])
(sent_bytes, total_byte_count, (sent_bytes, total_byte_count,
overflow_occured, log_channel, dds_onehot_sel) = parts error_occured, log_channel, dds_onehot_sel) = parts
expected_len = sent_bytes + 15 expected_len = sent_bytes + 15
if expected_len != len(data): if expected_len != len(data):
raise ValueError("analyzer dump has incorrect length " raise ValueError("analyzer dump has incorrect length "
"(got {}, expected {})".format( "(got {}, expected {})".format(
len(data), expected_len)) len(data), expected_len))
if overflow_occured: if error_occured:
logger.warning("analyzer FIFO overflow occured, " logger.warning("error occured within the analyzer, "
"some messages have been lost") "data may be corrupted")
if total_byte_count > sent_bytes: if total_byte_count > sent_bytes:
logger.info("analyzer ring buffer has wrapped %d times", logger.info("analyzer ring buffer has wrapped %d times",
total_byte_count//sent_bytes) total_byte_count//sent_bytes)