Code

Feature/dds driver#549

Code

Closed

maij wants to merge 76 commits intomicrosoft:mastermicrosoft/Qcodes:masterfrom nulinspiratie:feature/DDS_drivernulinspiratie/Qcodes:feature/DDS_driverCopy head branch name to clipboard

+2,899

Commits

Commits on Mar 2, 2017

• Add empty Signadyne driver package

  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  88a7071

  Copy full SHA for 88a7071

Commits on Mar 6, 2017

• feat: add get parameters to driver for M3201A

  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  1cd4e3f

  Copy full SHA for 1cd4e3f

• Initial commit of general Signadyne digitizer implementation, as well as a skeleton for the M3300A combo card.

  maij

  committed
  caa281e

  Copy full SHA for caa281e

• Merge remote-tracking branch 'refs/remotes/QCoDeS/master' into feature/signadyne_driver

  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  da44c8e

  Copy full SHA for da44c8e

• Changed init command to take kwargs. Fixed some line endings.

  maij

  committed
  86a49a7

  Copy full SHA for 86a49a7

• Added a test class for the Signadyne digitizer base class.

  Show description for c74fc38
  maij

  committed
  c74fc38

  Copy full SHA for c74fc38

• feat: add test suite for signadyne drivers

  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  9396eee

  Copy full SHA for 9396eee

• feat: add 'off' function to M3201A awg driver

  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  e59aec0

  Copy full SHA for e59aec0

Commits on Mar 7, 2017

• fix: add correct get_cmd to the pxi_trigger_number parameters

  Show description for 0457fd0
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  0457fd0

  Copy full SHA for 0457fd0

• fix: add corrected assert_equal tests

  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  64ebc54

  Copy full SHA for 64ebc54

• Changed the implementation of trigger threshold and mode from parameters to private attributes with set and get functions.

  maij

  committed
  b7b58cd

  Copy full SHA for b7b58cd

• fix : Make __trigger_mode and __trigger_threshold object variables, not class variables. This should be convention for all future variables.

  maij

  committed
  82bfce8

  Copy full SHA for 82bfce8

• feat: add more parameters and methods to the M3201A driver class

  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  9e6c7a7

  Copy full SHA for 9e6c7a7

• test: add missing test to M3201A test suite

  Show description for 6981a92
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  6981a92

  Copy full SHA for 6981a92

Commits on Mar 8, 2017

• Adding a set of default values to be used by get/set functions before parameters can be defined.

  maij

  committed
  6b47915

  Copy full SHA for 6b47915

• feat: add channel-related parameters and clock test function

  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  b04bba0

  Copy full SHA for b04bba0

• Added all necessary parameters without set/get commands defined.

  Show description for 17d0770
  maij

  committed
  17d0770

  Copy full SHA for 17d0770

Commits on Mar 9, 2017

• fix: correct the order of arguments of several set functions

  Show description for d7bde58
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  d7bde58

  Copy full SHA for d7bde58

• test: add channel-related test functions

  Show description for 6fbbf1d
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  6fbbf1d

  Copy full SHA for 6fbbf1d

• Fixed references to SD_TriggerModes.

  Show description for a90e7a2
  maij

  committed
  a90e7a2

  Copy full SHA for a90e7a2

• Created set functions for all parameters, yet to be implemented.

  maij

  committed
  74118c8

  Copy full SHA for 74118c8

• feat: add set-cmd to pxi_trigger + test function

  Show description for 0c0d7bb
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  0c0d7bb

  Copy full SHA for 0c0d7bb

• Fixed syntactical issues, simplified variables and removed unused variable from parameters.

  maij

  committed
  e309079

  Copy full SHA for e309079

• Defined settable+gettable parameters set+get commands.

  maij

  committed
  dd26f2d

  Copy full SHA for dd26f2d

• Fixed some labelling issues with only settable parameters, and removed their get cmd definitions.

  maij

  committed
  323da65

  Copy full SHA for 323da65

Commits on Mar 10, 2017

• feat: add waveform and awg related functions

  Show description for 6b4e04f
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  6b4e04f

  Copy full SHA for 6b4e04f

• Fix: Move class variables outside of look and create list all at once.

  Show description for 35b0484
  maij

  committed
  35b0484

  Copy full SHA for 35b0484

• Fix : added self references to ensure instantiance funcs of SD_AIN are used instead of class funcs.

  Show description for d52ec19
  maij

  committed
  d52ec19

  Copy full SHA for d52ec19

• Fix : added self reference to all class functions to ensure they can be shared with other funcitons.

  maij

  committed
  c5413bc

  Copy full SHA for c5413bc

• feat: add waveform related functions

  Show description for 96e58f8
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  96e58f8

  Copy full SHA for 96e58f8

• Added more parameters to manage the SD funcs DAQconfig and DAQtriggerExternalConfig

  maij

  committed
  3c54384

  Copy full SHA for 3c54384

Commits on Mar 12, 2017

• Merge pull request #2 from nulinspiratie/feature/signadyne_digitizer

  Show description for aa56b77
  

  lgnjanssen

  authored
  aa56b77

  Copy full SHA for aa56b77

• Merge pull request #1 from nulinspiratie/feature/signadyne_awg_driver

  Show description for a8bcc0d
  

  lgnjanssen

  authored
  a8bcc0d

  Copy full SHA for a8bcc0d

Commits on Mar 13, 2017

• refactor: add classification and rename signadyne->keysight

  Show description for 1ef2293
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  1ef2293

  Copy full SHA for 1ef2293

• fix : change all set commands to the stub implementations within the class

  maij

  committed
  a7b6079

  Copy full SHA for a7b6079

• feat: implement functions to set parameters for channel input, channel triggers, DAQ config and DAQ ext. triggers.

  maij

  committed
  ebc508d

  Copy full SHA for ebc508d

• feat: add missing parameters utilised by DAQtriggerExternalConfig

  maij

  committed
  6c81658

  Copy full SHA for 6c81658

• feat: implement set functions for DAQread and DAQtriggerExternalConfig parameters

  maij

  committed
  45428ee

  Copy full SHA for 45428ee

• refactor: add classification (M3201A)--inherits-->(SD_AWG)

  Show description for ad86f2b
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  ad86f2b

  Copy full SHA for ad86f2b

• style: change some code alignment in blocks and remove unused packages

  maij

  committed
  1e38f08

  Copy full SHA for 1e38f08

• feat: add stub implementation of basic user functions to use the DAQ

  maij

  committed
  0c3bb59

  Copy full SHA for 0c3bb59

• fix : removed parameters to deal with clockResetPhase functionality and replaced with a user function.

  maij

  committed
  0d7892a

  Copy full SHA for 0d7892a

Commits on Mar 14, 2017

• fix : remove parameter functions for previously deleted parameters in commit 0d7892a

  maij

  committed
  29b6706

  Copy full SHA for 29b6706

• feat : implemented set/get cmds for IO trigger and internal frequency parameters.

  maij

  committed
  27c3710

  Copy full SHA for 27c3710

• fix : remove unused internal variables

  maij

  committed
  5b44448

  Copy full SHA for 5b44448

• fix : change trigger port accepted values to 0 or 1. Remove unnecessary internal set function.

  maij

  committed
  549cc42

  Copy full SHA for 549cc42

• feat: implemented IO trigger functions

  maij

  committed
  deec1c1

  Copy full SHA for deec1c1

• feat: implement DAQ user functions

  maij

  committed
  e01f132

  Copy full SHA for e01f132

• feat: implement DAQ_read function to request data from a DAQ.

  maij

  committed
  73c4cae

  Copy full SHA for 73c4cae

• fix: remove calls to DAQread in set commands.

  maij

  committed
  0d18947

  Copy full SHA for 0d18947

Commits on Mar 15, 2017

• Merge pull request #3 from nulinspiratie/feature/signadyne_driver_classification

  Show description for ef0daf0
  maij

  authored
  ef0daf0

  Copy full SHA for ef0daf0

• Merge branch 'feature/signadyne_driver' into feature/SD_DIG_functions

  Show description for 91811f0
  maij

  committed
  91811f0

  Copy full SHA for 91811f0

• fix: make all internal function calls go through self

  maij

  committed
  633fd1a

  Copy full SHA for 633fd1a

• refactor: make SD_DIG a subclass of SD_Module, and so change __init__ args.

  maij

  committed
  6d16eac

  Copy full SHA for 6d16eac

• fix: change libraries to newer keysight libs, and use correct method to import classes from a file

  maij

  committed
  943f8a0

  Copy full SHA for 943f8a0

• fix: change top level class for the M3300 card to two separate classes for the digitizer and AWG functionality

  maij

  committed
  29c3c63

  Copy full SHA for 29c3c63

Commits on Mar 19, 2017

• fix: indentation in the M3300 card and change library reference to use relative addressing.

  maij

  committed
  eacbd60

  Copy full SHA for eacbd60

• fix: open the device during SD_DIG.__init__()

  maij

  committed
  3a813ca

  Copy full SHA for 3a813ca

• fix: change channel triggering to accept correct range of values, also replace old variable __analogTriggerMode

  maij

  committed
  d5d6d9a

  Copy full SHA for d5d6d9a

• fix: refer to self for all internal variables, also fix set_points_per_cycle to allow for partial application.

  maij

  committed
  7938313

  Copy full SHA for 7938313

• refactor: fix whitespace

  maij

  committed
  54bb121

  Copy full SHA for 54bb121

• fix: refer to SD_Module class through relative addressing.

  maij

  committed
  d267e5f

  Copy full SHA for d267e5f

Commits on Mar 20, 2017

• feat: added test suite for M3300A AWG driver (duplicated from existing test suite)

  maij

  committed
  b105666

  Copy full SHA for b105666

Commits on Mar 22, 2017

• fix: edit waveform-creating functions to return SD_Wave instances

  Show description for e2cc9de
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  e2cc9de

  Copy full SHA for e2cc9de

• feat: add default 'name' in result_parser

  Show description for 47746b4
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  47746b4

  Copy full SHA for 47746b4

• feat: add verbose printing and error parsing for set and DAQ functions.

  maij

  committed
  13a485a

  Copy full SHA for 13a485a

• refactor: move pxi-read/write to SD_Module level

  Show description for a526e5a
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  a526e5a

  Copy full SHA for a526e5a

• feat: add wrapper for library get_cmds to enable result parsing

  maij

  committed
  a92dfc9

  Copy full SHA for a92dfc9

• refactor: deprecate get_trigger_threshold and get_trigger_mode as there is no real reason to use a get_cmd rather than get_latest for a purely settable device parameter

  maij

  committed
  f980993

  Copy full SHA for f980993

• feat: add FPGA PCport related functions

  Show description for ec8d44e
  

  lgnjanssen

  authored and

  lgnjanssen

  committed
  ec8d44e

  Copy full SHA for ec8d44e

• fix: add instance to result parser for DAQ_read numpy arrays

  maij

  committed
  996844b

  Copy full SHA for 996844b

• fix: remove deprecated decorator as the decorator is not defined

  maij

  committed
  385b484

  Copy full SHA for 385b484

• fix: add missing 'or' operator

  maij

  committed
  73c89f4

  Copy full SHA for 73c89f4

• Merge pull request #5 from nulinspiratie/feature/signadyne_digitizer_integration

  Show description for ef1380e
  maij

  authored
  ef1380e

  Copy full SHA for ef1380e

• Merge pull request #6 from nulinspiratie/feature/signadyne_driver_updates

  Show description for f2cc7f9
  maij

  authored
  f2cc7f9

  Copy full SHA for f2cc7f9

Commits on Mar 27, 2017

• feat: add basic implementation of Pulseblaster DDS driver. Uses a modified spinapi to include DDS functions in the C lib.

  maij

  committed
  f9c4116

  Copy full SHA for f9c4116