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

Support for LabJack DAQ devices #890

Merged
merged 17 commits into from Jan 2, 2024
Merged

Support for LabJack DAQ devices #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4788a24
Added a device for the LabJack T7 with digital and analog I/Os.
canismarko Nov 18, 2023
ee245d6
Added digital input words to the LabJack device.
canismarko Nov 18, 2023
4d970a8
Added support for the waveform digitizer.
canismarko Nov 21, 2023
fefb403
Added support for the waveform generator on a labjack device.
canismarko Nov 21, 2023
626d98c
Extended the labjack T7 support to include the T4, T7-Pro and T8.
canismarko Nov 21, 2023
be34847
Cleaned up the labjack device PVs so that they match the EPICS database.
canismarko Nov 21, 2023
0ea75b0
Added documentation for the labjack device.
canismarko Nov 21, 2023
fe3d0ed
Fixed tests that had broken after updated PVs with real hardware.
canismarko Nov 21, 2023
f756fd6
Cleaned up documentation for labjack support.
canismarko Nov 21, 2023
660c36a
Black and isort.
canismarko Nov 21, 2023
05a8d66
Merge branch 'BCDA-APS:main' into main
canismarko Nov 21, 2023
ccdd559
Fixed flake8 failures for CI.
canismarko Nov 21, 2023
6da0a21
Added the LabJackBase docstring to the four device sub-classes.
canismarko Nov 29, 2023
22c00db
Black formatting.
canismarko Nov 29, 2023
f698f06
Cleaned up doc strings for labjack devices.
canismarko Jan 2, 2024
c78e933
Fixed a typo in arguments for adding analog outputs to labjack devices.
canismarko Jan 2, 2024
10bfc77
Added a docstring to the generic Output class.
canismarko Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions apstools/devices/__init__.py
View file
Open in desktop
Expand Up @@ -68,6 +68,8 @@
from .lakeshore_controllers import LakeShore336Device
from .lakeshore_controllers import LakeShore340Device

from .labjack import LabJackT4, LabJackT7, LabJackT7Pro, LabJackT8

from .linkam_controllers import Linkam_CI94_Device
from .linkam_controllers import Linkam_T96_Device

Expand Down