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

merged 17 commits into from
Jan 2, 2024

Conversation

canismarko
Copy link
Collaborator

Fixes #879.

One note: I created a LabJackBase class and then subclass this for the various T-series devices (e.g. LabJackT4). Makes the code easy to maintain, but docstring don't seem to be inheriting properly on the sphinx autoapi.

@canismarko canismarko requested a review from prjemian November 21, 2023 23:06
prjemian
prjemian reviewed Jan 1, 2024
View reviewed changes
apstools/devices/labjack.py Outdated
class AnalogOutput(Output):
"""An analog output on a labjack device."""

pass
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line can be removed

prjemian
prjemian requested changes Jan 1, 2024
View reviewed changes
Copy link
Contributor

@prjemian prjemian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, minor documentation changes. Happy New Year!

canismarko
canismarko commented Jan 2, 2024
View reviewed changes
Copy link
Collaborator Author

@canismarko canismarko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback. Changes made as suggested and added as several new commits.

@canismarko canismarko requested a review from prjemian January 2, 2024 04:22
prjemian
prjemian approved these changes Jan 2, 2024
View reviewed changes
Copy link
Contributor

@prjemian prjemian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! Thanks for the contribution!

@prjemian
Copy link
Contributor

prjemian commented Jan 2, 2024

@canismarko: If you can, push the green merge button.

@canismarko canismarko merged commit d47c55a into BCDA-APS:main Jan 2, 2024
13 checks passed
@prjemian prjemian added this to the 1.6.18 milestone Jan 2, 2024
prjemian added a commit that referenced this pull request Jan 2, 2024
@prjemian
DOC #890
0c416a7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prjemian prjemian prjemian approved these changes

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
1.6.18
Development

Successfully merging this pull request may close these issues.

LabJack T7 support
2 participants
@canismarko @prjemian