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

Feature/dds driver #549

Closed
wants to merge 76 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
88a7071
Add empty Signadyne driver package
Mar 2, 2017
1cd4e3f
feat: add get parameters to driver for M3201A
Mar 6, 2017
caa281e
Initial commit of general Signadyne digitizer implementation, as well…
maij Mar 6, 2017
da44c8e
Merge remote-tracking branch 'refs/remotes/QCoDeS/master' into featur…
Mar 6, 2017
86a49a7
Changed init command to take kwargs. Fixed some line endings.
maij Mar 6, 2017
c74fc38
Added a test class for the Signadyne digitizer base class.
maij Mar 6, 2017
9396eee
feat: add test suite for signadyne drivers
Mar 6, 2017
e59aec0
feat: add 'off' function to M3201A awg driver
Mar 6, 2017
0457fd0
fix: add correct get_cmd to the pxi_trigger_number parameters
Mar 7, 2017
64ebc54
fix: add corrected assert_equal tests
Mar 7, 2017
b7b58cd
Changed the implementation of trigger threshold and mode from paramet…
maij Mar 7, 2017
82bfce8
fix : Make __trigger_mode and __trigger_threshold object variables, n…
maij Mar 7, 2017
9e6c7a7
feat: add more parameters and methods to the M3201A driver class
Mar 7, 2017
6981a92
test: add missing test to M3201A test suite
Mar 7, 2017
6b47915
Adding a set of default values to be used by get/set functions before…
maij Mar 8, 2017
b04bba0
feat: add channel-related parameters and clock test function
Mar 8, 2017
17d0770
Added all necessary parameters without set/get commands defined.
maij Mar 8, 2017
d7bde58
fix: correct the order of arguments of several set functions
Mar 9, 2017
6fbbf1d
test: add channel-related test functions
Mar 9, 2017
a90e7a2
Fixed references to SD_TriggerModes.
maij Mar 9, 2017
74118c8
Created set functions for all parameters, yet to be implemented.
maij Mar 9, 2017
0c0d7bb
feat: add set-cmd to pxi_trigger + test function
Mar 9, 2017
e309079
Fixed syntactical issues, simplified variables and removed unused var…
maij Mar 9, 2017
dd26f2d
Defined settable+gettable parameters set+get commands.
maij Mar 9, 2017
323da65
Fixed some labelling issues with only settable parameters, and remove…
maij Mar 9, 2017
6b4e04f
feat: add waveform and awg related functions
Mar 10, 2017
35b0484
Fix: Move class variables outside of look and create list all at once.
maij Mar 10, 2017
d52ec19
Fix : added self references to ensure instantiance funcs of SD_AIN ar…
maij Mar 10, 2017
c5413bc
Fix : added self reference to all class functions to ensure they can …
maij Mar 10, 2017
96e58f8
feat: add waveform related functions
Mar 10, 2017
3c54384
Added more parameters to manage the SD funcs DAQconfig and DAQtrigger…
maij Mar 10, 2017
aa56b77
Merge pull request #2 from nulinspiratie/feature/signadyne_digitizer
Mar 12, 2017
a8bcc0d
Merge pull request #1 from nulinspiratie/feature/signadyne_awg_driver
Mar 12, 2017
1ef2293
refactor: add classification and rename signadyne->keysight
Mar 13, 2017
a7b6079
fix : change all set commands to the stub implementations within the …
maij Mar 13, 2017
ebc508d
feat: implement functions to set parameters for channel input, channe…
maij Mar 13, 2017
6c81658
feat: add missing parameters utilised by DAQtriggerExternalConfig
maij Mar 13, 2017
45428ee
feat: implement set functions for DAQread and DAQtriggerExternalConfi…
maij Mar 13, 2017
ad86f2b
refactor: add classification (M3201A)--inherits-->(SD_AWG)
Mar 13, 2017
1e38f08
style: change some code alignment in blocks and remove unused packages
maij Mar 13, 2017
0c3bb59
feat: add stub implementation of basic user functions to use the DAQ
maij Mar 13, 2017
0d7892a
fix : removed parameters to deal with clockResetPhase functionality a…
maij Mar 13, 2017
29b6706
fix : remove parameter functions for previously deleted parameters in…
maij Mar 14, 2017
27c3710
feat : implemented set/get cmds for IO trigger and internal frequency…
maij Mar 14, 2017
5b44448
fix : remove unused internal variables
maij Mar 14, 2017
549cc42
fix : change trigger port accepted values to 0 or 1. Remove unnecessa…
maij Mar 14, 2017
deec1c1
feat: implemented IO trigger functions
maij Mar 14, 2017
e01f132
feat: implement DAQ user functions
maij Mar 14, 2017
73c4cae
feat: implement DAQ_read function to request data from a DAQ.
maij Mar 14, 2017
0d18947
fix: remove calls to DAQread in set commands.
maij Mar 14, 2017
ef0daf0
Merge pull request #3 from nulinspiratie/feature/signadyne_driver_cla…
maij Mar 15, 2017
91811f0
Merge branch 'feature/signadyne_driver' into feature/SD_DIG_functions
maij Mar 15, 2017
633fd1a
fix: make all internal function calls go through self
maij Mar 15, 2017
6d16eac
refactor: make SD_DIG a subclass of SD_Module, and so change __init__…
maij Mar 15, 2017
943f8a0
fix: change libraries to newer keysight libs, and use correct method …
maij Mar 15, 2017
29c3c63
fix: change top level class for the M3300 card to two separate classe…
maij Mar 15, 2017
eacbd60
fix: indentation in the M3300 card and change library reference to us…
maij Mar 19, 2017
3a813ca
fix: open the device during SD_DIG.__init__()
maij Mar 19, 2017
d5d6d9a
fix: change channel triggering to accept correct range of values, als…
maij Mar 19, 2017
7938313
fix: refer to self for all internal variables, also fix set_points_pe…
maij Mar 19, 2017
54bb121
refactor: fix whitespace
maij Mar 19, 2017
d267e5f
fix: refer to SD_Module class through relative addressing.
maij Mar 19, 2017
b105666
feat: added test suite for M3300A AWG driver (duplicated from existi…
maij Mar 20, 2017
e2cc9de
fix: edit waveform-creating functions to return SD_Wave instances
Mar 22, 2017
47746b4
feat: add default 'name' in result_parser
Mar 22, 2017
13a485a
feat: add verbose printing and error parsing for set and DAQ functions.
maij Mar 22, 2017
a526e5a
refactor: move pxi-read/write to SD_Module level
Mar 22, 2017
a92dfc9
feat: add wrapper for library get_cmds to enable result parsing
maij Mar 22, 2017
f980993
refactor: deprecate get_trigger_threshold and get_trigger_mode as the…
maij Mar 22, 2017
ec8d44e
feat: add FPGA PCport related functions
Mar 22, 2017
996844b
fix: add instance to result parser for DAQ_read numpy arrays
maij Mar 22, 2017
385b484
fix: remove deprecated decorator as the decorator is not defined
maij Mar 22, 2017
73c89f4
fix: add missing 'or' operator
maij Mar 22, 2017
ef1380e
Merge pull request #5 from nulinspiratie/feature/signadyne_digitizer_…
maij Mar 22, 2017
f2cc7f9
Merge pull request #6 from nulinspiratie/feature/signadyne_driver_upd…
maij Mar 22, 2017
f9c4116
feat: add basic implementation of Pulseblaster DDS driver. Uses a mod…
maij Mar 27, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions qcodes/instrument_drivers/keysight/M3201A.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# from qcodes import validators as validator
# from functools import partial
#
# from .SD_common.SD_Module import *
from .SD_common.SD_AWG import *


class Keysight_M3201A(SD_AWG):
"""
This is the qcodes driver for the Keysight M3201A AWG PXIe card

Args:
name (str): name for this instrument, passed to the base instrument
chassis (int): chassis number where the device is located
slot (int): slot number where the device is plugged in
"""

def __init__(self, name, chassis=1, slot=7, **kwargs):
super().__init__(name, chassis, slot, channels=4, triggers=8, **kwargs)
43 changes: 43 additions & 0 deletions qcodes/instrument_drivers/keysight/M3300A.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
###################################################################################
# #
# Driver file for M3300A #
# #
###################################################################################
# #
# Written by: Mark Johnson #
# Also see: http://www.keysight.com/en/pd-2747490-pn-M3300A #
# #
###################################################################################

try:
from .SD_common.SD_AWG import SD_AWG
from .SD_common.SD_DIG import SD_DIG
except ImportError:
raise ImportError('To use the M3300A driver, install the keysight module')

class M3300A_AWG(SD_AWG):
""" Driver for the AWG of the Keysight M3300A card.

Args:
name (str) : name for this instrument, passed to the base instrument
chassis (int) : chassis number where the device is located
slot (int) : slot number where the device is plugged in
Example:
AWG = AWG('M3300A')
"""
def __init__(self, name, chassis=1, slot=8, **kwargs):
super().__init__(name, chassis=1, slot=8, channels=4, triggers=8, **kwargs)

class M3300A_DIG(SD_DIG):
""" Driver for the digitizer of the keysight M3300A card.

Args:
name (str) : name for this instrument, passed to the base instrument
chassis (int) : chassis number where the device is located
slot (int) : slot number where the device is plugged in

Example:
DIG = DIG('M3300A')
"""
def __init__(self, name, chassis=1, slot=8, **kwargs):
super().__init__(name, chassis, slot, channels=8, triggers=8, **kwargs)
Loading