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.

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

Keithley 6485 + Keithley 6517b support #423

Open
wants to merge 90 commits into
base: main
Choose a base branch
from

Conversation

francois-drielsma
Copy link

@francois-drielsma francois-drielsma commented Oct 4, 2024

This PR adds support for two Keithley devices:

  • Keithley 6485 picoammeter
  • Keithley 6517b electrometer

It also includes minor fixes in the Glassman FR support (fixes the set voltage/current queries).

scasagrande and others added 30 commits February 7, 2019 17:31
Where checking if value is in enum will raise value error in Py38
* Added driver/motor tables for T/KDC001 APT devs.

* Moved TODO comment to avoid pylint error.

* Misc Py3k changes for ThorLabs APT

* motion_timeout for APT motor cmds, fix scale factor

* ThorLabsAPT: Example of new config support.

* More pylint fixes

* Fix for line continuation convention.

* Rearranged imports into standard order.

* Added an APT test. Not working yet.

* Fix linting issues

* New handling in loopback for empty terminator.

* struct.Struct for contents of hw_info packets

* Support for specifying expected apt pkt sizes

* Fixes to APT and APT tests

* Missed a conflict marker.

* Fixed bug due to `if size` falling through on size == 0.

* Removed trailing whitespace.

* Locked requirements.txt; see instrumentkit#174.

* Remove numpy version pinning in requirements.txt

* Add tests to cover additional loopback comm behaviour

* Make pylint happy

* Revert changes to size=0 behaviour in loopback comm
…#202)

* Fix bug with SCPIFunctionGenerator.function, add tests

* Fix linting
* Function Generator single/multi-channel consistency

* Fix Py27 linting issue

* Fix linting issue

* Add tests for FunctionGenerator abstract instrument
* added mhs5200

* added minghe function generator

* added absolute_import

* fixed scaling on frequency

* switched to abstract instrument class

* fixed a few docstrings

* after testing with device

* Minghe MHS5200 - Add instrument to docs

* isolating changes from cc1 test station:

* Revert "isolating changes from cc1 test station:"

This reverts commit 87b8dec.

* reverting changes and fixing duty cycle

* Update for new FunctionGenerator multichannel consistency update
francois-drielsma and others added 28 commits August 12, 2019 22:12
@scasagrande
Copy link
Contributor

thank you for the contribution! can you clean up the git history? and it looks like there are some test issues

@francois-drielsma
Copy link
Author

Sure can! This might take me a bit of time as I'm a bit swamped with other things at the moment, but I'll get there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants