Skip to content
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

Jump to bottom

Driver for select Tektronix TDS, TPS, and TBS low-end models #213

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Driver for select Tektronix TDS, TPS, and TBS low-end models #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3b5b123
tektronix-tds: Initial driver skeleton.
byteit101 Mar 1, 2023
5afb6ff
udev: add Tektronix TDS 2024 USB indentification rule
byteit101 Apr 9, 2023
ff1fe69
tektronix-tds: Add driver for select Tektronix TDS/TPS/TBS scopes
byteit101 Apr 9, 2023
fd35246
tektronix-tds: Return correct values for digits and buffer size
byteit101 Apr 9, 2023
c495784
tektronix-tds: Add mutex for multi-threaded clients
byteit101 Apr 9, 2023
18afa67
tektronix-tds: Reorder protocol.c functions to classic C ordering
byteit101 Apr 9, 2023
4fc4d3e
scpi: rename "current channel name" variable (false friends)
gsigh Apr 8, 2023
5abb579
scpi: reduce indentation in continuation lines (function signatures)
gsigh Apr 8, 2023
d513923
scpi: rephrase *OPC? checker routine, stricter success check
gsigh Apr 9, 2023
8afe9e3
scpi: rephrase device instance creation (resource match, error path)
gsigh Apr 9, 2023
c7da8bf
scpi: add optional pause between reads when no receive data is seen
gsigh Apr 9, 2023
95c02a0
scpi: minor nits in common text response read routine
gsigh Apr 9, 2023
9e507aa
scpi: separate helper to make free space in receive buffer
gsigh Apr 9, 2023
92b4959
scpi_tcp: don't put colon into connection id, breaks conn re-use
gsigh Apr 9, 2023
c7bd0ad
scpi: add "block ends" transport method, needed for SCPI over serial
gsigh Apr 8, 2023
b313131
scpi: comment and style nits in common data block getter
gsigh Apr 8, 2023
2089d67
scpi: rephrase common "get data block" routine
gsigh Apr 8, 2023
0c7d5e6
scpi: read end-of-message after data block reception
gsigh Apr 8, 2023
912a471
scpi: add "get text then block" reader (Tektronix TDS2000)
gsigh Apr 9, 2023
e7cd725
Merge branch 'scpi-blockonly' into tek_tds2000b
byteit101 May 21, 2023
4ea2dce
tektronix-tds: Set large timeout and use new scpi text+block parser
byteit101 May 21, 2023
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: 6 additions & 0 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,12 @@ src_libdrivers_la_SOURCES += \
src/hardware/sysclk-sla5032/protocol.c \
src/hardware/sysclk-sla5032/api.c
endif
if HW_TEKTRONIX_TDS
src_libdrivers_la_SOURCES += \
src/hardware/tektronix-tds/protocol.h \
src/hardware/tektronix-tds/protocol.c \
src/hardware/tektronix-tds/api.c
endif
if HW_TELEINFO
src_libdrivers_la_SOURCES += \
src/hardware/teleinfo/protocol.h \
Expand Down
1 change: 1 addition & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ SR_DRIVER([serial LCR], [serial-lcr], [serial_comm])
SR_DRIVER([Siglent SDS], [siglent-sds])
SR_DRIVER([Sysclk LWLA], [sysclk-lwla], [libusb])
SR_DRIVER([Sysclk SLA5032], [sysclk-sla5032], [libusb])
SR_DRIVER([Tektronix TDS], [tektronix-tds])
SR_DRIVER([Teleinfo], [teleinfo], [serial_comm])
SR_DRIVER([Testo], [testo], [libusb])
SR_DRIVER([Tondaj SL-814], [tondaj-sl-814], [serial_comm])
Expand Down
3 changes: 3 additions & 0 deletions contrib/60-libsigrok.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@ ATTRS{idVendor}=="2961", ATTRS{idProduct}=="6689", ENV{ID_SIGROK}="1"
# Sysclk SLA5032 ("32CH 500M" mode)
ATTRS{idVendor}=="2961", ATTRS{idProduct}=="66b0", ENV{ID_SIGROK}="1"

# Tektronix
ATTRS{idVendor}=="0699", ATTRS{idProduct}=="036a", ENV{ID_SIGROK}="1"

# Testo 435
ATTRS{idVendor}=="128d", ATTRS{idProduct}=="0003", ENV{ID_SIGROK}="1"

Expand Down
Loading