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

Siglent (SDG) drivers and Lakeshore625 drivers improvements #302

Merged
merged 7 commits into from
Mar 28, 2024

Conversation

hp-peti
Copy link
Contributor

@hp-peti hp-peti commented Feb 28, 2024

  • initial version for Siglent SDG type waveform generators and rudimentary support for SDS type scopes
  • some improvements for using the Lakeshore 625 in real-world scenarios where device state needs to be retained, and including persistent switch state support (ramp algorithm not included)

hp-peti and others added 2 commits February 28, 2024 14:05
* Siglent drivers skeleton

* Siglent SDG 60xx incl. OUTP command

* SDG basic wave parameters

* refactor Siglent SDG outp, no GroupGetParam needed

* modulate wave parameters

* some raw scpi command parameters

* some sweep wave parameters

* raw burst wave parameter

* minor siglent sdg driver fixes

* Siglent SDG sweep parameters

* TRMD parameter

* siglent sdg burst wave parameters

* more commands

*  field parsers

* improve handling of ranges

* simplify things and fix old-style dict merge in ranges

* cleanup sdg internal field getters

* more cleanup, siglent channel load to return & accept int only

* Siglent SDx: Retrieve screen dump bmp file bytes

* Trying to satisfy mypy requirements and ruff requirements at the same time

* string: remove suffix for python 3.8
- coil constant and field ramp rate to be read from instrument
- also extra parameters and init options
Copy link
Contributor

@astafan8 astafan8 left a comment

Choose a reason for hiding this comment

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

thank you for the contribution! Could you merge the latest main branch into your branch, because there seem to be conflicts now which prevents the merge of the pull-request from happening.

@hp-peti
Copy link
Contributor Author

hp-peti commented Mar 25, 2024

merged main into branch and moved the files to the src/ tree

@astafan8 astafan8 added this pull request to the merge queue Mar 28, 2024
Merged via the queue into QCoDeS:main with commit 9493db2 Mar 28, 2024
10 checks passed
This pull request was closed.
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.

2 participants