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

Add drivers for Keysight PXIE devices, M960X and M9336A #2613

Merged
merged 37 commits into from
Feb 26, 2021

Conversation

neildick
Copy link
Contributor

Hi all,
looking for feedback on these proposed drivers. I wrote them to support our testing efforts here in Sydney but they rely on wrapping the IVI-C .dll's from Keysight, so I'm not sure where the best place to commit them too is.

Included in the branch are two 'definition' files which are crude translations of the IVI-C c++ header files into something Python can interpret. These are necessary for all the magic numbers the .dll's expect.

Changes proposed in this pull request:

  • Add driver and definitions for M960X
  • Add driver and definitions for M9336A

https://www.keysight.com/main/software.jspx?ckey=3085523&lc=eng&cc=HK&nid=-11143.0.00&id=3085523
https://www.keysight.com/en/pd-2757436-pn-M9336A/pxie-i-q-arbitrary-waveform-generator-16-bit-540-mhz-3-scalar-channels?nid=-33321.1201965&cc=AU&lc=eng

@WilliamHPNielsen

Neil Dick added 8 commits January 14, 2021 08:45
These definitions come straight out of the IVI-C header file from
Keysight, KtM960x.h. They've been crudely converted from C++
hash defines into python constants.
Add initial driver support for the KtM960x. This wraps the IVI-C
dll with ctypes to support some basic parameters.
This is a basic set of parameters including a measurement
function to set up a output voltage anad measure a current.
Add the attributes and definitions from the KtMAwg.h header file
from Keysight.
This opens the KtMAwg.dll and reads out the information and
serial number from the driver.
Need to create a instr_channel class here.
Still need to split this into channel drivers, but this runs
in the simulator without errors.
Adds a channel list to the driver for the 3 channels.
Add a few parameters to control the gain
@astafan8 astafan8 added this to the 0.23.0 milestone Feb 11, 2021
@astafan8 astafan8 modified the milestones: 0.23.0, 0.24.0 Feb 16, 2021
qcodes/instrument_drivers/Keysight/KtM960x.py Outdated Show resolved Hide resolved
qcodes/instrument_drivers/Keysight/KtMAwg.py Outdated Show resolved Hide resolved
qcodes/instrument_drivers/Keysight/KtMAwg.py Outdated Show resolved Hide resolved
qcodes/instrument_drivers/Keysight/KtMAwg.py Outdated Show resolved Hide resolved
qcodes/instrument_drivers/Keysight/KtMAwg.py Show resolved Hide resolved
qcodes/instrument_drivers/Keysight/KtMAwg.py Outdated Show resolved Hide resolved
qcodes/instrument_drivers/Keysight/KtMAwg.py Outdated Show resolved Hide resolved
qcodes/instrument_drivers/Keysight/KtMAwg.py Outdated Show resolved Hide resolved
qcodes/instrument_drivers/Keysight/KtMAwg.py Show resolved Hide resolved
qcodes/instrument_drivers/Keysight/KtMAwg.py Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Feb 22, 2021

Codecov Report

Merging #2613 (ba7dcf9) into master (850bf01) will increase coverage by 0.97%.
The diff coverage is 84.36%.

@@            Coverage Diff             @@
##           master    #2613      +/-   ##
==========================================
+ Coverage   63.88%   64.85%   +0.97%     
==========================================
  Files         199      203       +4     
  Lines       26516    27840    +1324     
==========================================
+ Hits        16939    18056    +1117     
- Misses       9577     9784     +207     

@astafan8 astafan8 modified the milestones: 0.24.0, 0.23.0 Feb 24, 2021
@trevormorgan trevormorgan modified the milestones: 0.23.0, 0.24.0 Feb 26, 2021
qcodes/instrument_drivers/Keysight/KtM960x.py Outdated Show resolved Hide resolved
qcodes/instrument_drivers/Keysight/KtMAwg.py Outdated Show resolved Hide resolved
@jenshnielsen
Copy link
Collaborator

@Akshita07 please update the imports and we can get it in

@jenshnielsen jenshnielsen merged commit 3064462 into microsoft:master Feb 26, 2021
@trevormorgan trevormorgan modified the milestones: 0.24.0, 0.23.0 Feb 26, 2021
@neildick
Copy link
Contributor Author

Thanks for the help here guys!

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

Successfully merging this pull request may close these issues.

None yet

5 participants