Skip to content

Support data size length longer than 9 digits in binblockread #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scasagrande merged 1 commit into from
Jan 12, 2026
Merged

Support data size length longer than 9 digits in binblockread #466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/instruments/abstract_instruments/instrument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ def binblockread(self, data_width, fmt=None):
as EOL terminators naturally can not be used in binary transfers.

The format is as follows:
#{number of following digits:1-9}{num of bytes to be read}{data bytes}
#{number of following digits:1-F}{num of bytes to be read}{data bytes}

:param int data_width: Specify the number of bytes wide each data
point is. One of [1,2,4].
Expand All @@ -291,7 +291,7 @@ def binblockread(self, data_width, fmt=None):
)
else:
# Read in the num of digits for next part
digits = int(self._file.read_raw(1))
digits = int(self._file.read_raw(1), 16)

# Read in the num of bytes to be read
num_of_bytes = int(self._file.read_raw(digits))
Expand All @@ -313,7 +313,7 @@ def binblockread(self, data_width, fmt=None):
tries -= 1
if tries == 0:
raise OSError(
"Did not read in the required number of bytes"
"Did not read in the required number of bytes "
"during binblock read. Got {}, expected "
"{}".format(len(data), num_of_bytes)
)
Expand Down
Loading