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

Commits on Mar 2, 2017

  1. Add empty Signadyne driver package

    lgnjanssen authored and lgnjanssen committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    88a7071 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2017

  1. feat: add get parameters to driver for M3201A

    lgnjanssen authored and lgnjanssen committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    1cd4e3f View commit details
    Browse the repository at this point in the history
  2. Initial commit of general Signadyne digitizer implementation, as well…

    … as a skeleton for the M3300A combo card.
    maij committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    caa281e View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'refs/remotes/QCoDeS/master' into featur…

    …e/signadyne_driver
    lgnjanssen authored and lgnjanssen committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    da44c8e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    86a49a7 View commit details
    Browse the repository at this point in the history
  5. Added a test class for the Signadyne digitizer base class.

    Also removed unnecessary wrapper functions in the base class.
    maij committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    c74fc38 View commit details
    Browse the repository at this point in the history
  6. feat: add test suite for signadyne drivers

    lgnjanssen authored and lgnjanssen committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    9396eee View commit details
    Browse the repository at this point in the history
  7. feat: add 'off' function to M3201A awg driver

    lgnjanssen authored and lgnjanssen committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    e59aec0 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2017

  1. fix: add correct get_cmd to the pxi_trigger_number parameters

    Add a correct get_cmd, since it previously was not a function, rather an evaluated function.
    lgnjanssen authored and lgnjanssen committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    0457fd0 View commit details
    Browse the repository at this point in the history
  2. fix: add corrected assert_equal tests

    lgnjanssen authored and lgnjanssen committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    64ebc54 View commit details
    Browse the repository at this point in the history
  3. Changed the implementation of trigger threshold and mode from paramet…

    …ers to private attributes with set and get functions.
    maij committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    b7b58cd View commit details
    Browse the repository at this point in the history
  4. fix : Make __trigger_mode and __trigger_threshold object variables, n…

    …ot class variables. This should be convention for all future variables.
    maij committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    82bfce8 View commit details
    Browse the repository at this point in the history
  5. feat: add more parameters and methods to the M3201A driver class

    lgnjanssen authored and lgnjanssen committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    9e6c7a7 View commit details
    Browse the repository at this point in the history
  6. test: add missing test to M3201A test suite

    Add missing test for testing open/close and chassis/slot related functions.
    lgnjanssen authored and lgnjanssen committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    6981a92 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2017

  1. Adding a set of default values to be used by get/set functions before…

    … parameters can be defined.
    maij committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    6b47915 View commit details
    Browse the repository at this point in the history
  2. feat: add channel-related parameters and clock test function

    lgnjanssen authored and lgnjanssen committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    b04bba0 View commit details
    Browse the repository at this point in the history
  3. Added all necessary parameters without set/get commands defined.

    Also created internal variable storage to aid get/set commands with first time execution.
    maij committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    17d0770 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2017

  1. fix: correct the order of arguments of several set functions

    change the order of positional arguments of several channel-related set functions so they can be used in 'partial'
    lgnjanssen authored and lgnjanssen committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    d7bde58 View commit details
    Browse the repository at this point in the history
  2. test: add channel-related test functions

    add test functions for channel-related set-commands like frequency, phase, amplitude, offset and wave chape
    lgnjanssen authored and lgnjanssen committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    6fbbf1d View commit details
    Browse the repository at this point in the history
  3. Fixed references to SD_TriggerModes.

    Fixed some missing parentheses.
    maij committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    a90e7a2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    74118c8 View commit details
    Browse the repository at this point in the history
  5. feat: add set-cmd to pxi_trigger + test function

    previously only the get-cmd was available. This commit adds the set-cmd and also add a test function for this parameter.
    lgnjanssen authored and lgnjanssen committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    0c0d7bb View commit details
    Browse the repository at this point in the history
  6. Fixed syntactical issues, simplified variables and removed unused var…

    …iable from parameters.
    maij committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    e309079 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    dd26f2d View commit details
    Browse the repository at this point in the history
  8. Fixed some labelling issues with only settable parameters, and remove…

    …d their get cmd definitions.
    maij committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    323da65 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2017

  1. feat: add waveform and awg related functions

    Add waveform and awg related functions to the M3201A driver. Also add clock and trigger related functions.
    lgnjanssen authored and lgnjanssen committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    6b4e04f View commit details
    Browse the repository at this point in the history
  2. Fix: Move class variables outside of look and create list all at once.

    Changed library location to be ~/site_packages/signadyne.py to agree with SD AWG driver.
    maij committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    35b0484 View commit details
    Browse the repository at this point in the history
  3. Fix : added self references to ensure instantiance funcs of SD_AIN ar…

    …e used instead of class funcs.
    
    Small corrections to some validator declarations.
    maij committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    d52ec19 View commit details
    Browse the repository at this point in the history
  4. Fix : added self reference to all class functions to ensure they can …

    …be shared with other funcitons.
    maij committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    c5413bc View commit details
    Browse the repository at this point in the history
  5. feat: add waveform related functions

    Add waveform related functions to the M3201A driver and also fix waveform writing convention
    lgnjanssen authored and lgnjanssen committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    96e58f8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3c54384 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2017

  1. Merge pull request #2 from nulinspiratie/feature/signadyne_digitizer

    Feature/signadyne digitizer
    lgnjanssen committed Mar 12, 2017
    Configuration menu
    Copy the full SHA
    aa56b77 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1 from nulinspiratie/feature/signadyne_awg_driver

    feat: driver for M3201A awg
    lgnjanssen committed Mar 12, 2017
    Configuration menu
    Copy the full SHA
    a8bcc0d View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2017

  1. refactor: add classification and rename signadyne->keysight

    Rename driver and classes due to acquisition of Signadyne by Keysight and add classification (M3201A)--inherits-->(SD_Module)
    lgnjanssen authored and lgnjanssen committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    1ef2293 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a7b6079 View commit details
    Browse the repository at this point in the history
  3. feat: implement functions to set parameters for channel input, channe…

    …l triggers, DAQ config and DAQ ext. triggers.
    maij committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    ebc508d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6c81658 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    45428ee View commit details
    Browse the repository at this point in the history
  6. refactor: add classification (M3201A)--inherits-->(SD_AWG)

    Add classification of (M3201A)--inherits-->(SD_AWG), which means a new driver class for each Keysight AWG card can be easily added by specifying card-specifics (e.g. number of channels)
    lgnjanssen authored and lgnjanssen committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    ad86f2b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1e38f08 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0c3bb59 View commit details
    Browse the repository at this point in the history
  9. fix : removed parameters to deal with clockResetPhase functionality a…

    …nd replaced with a user function.
    maij committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    0d7892a View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2017

  1. Configuration menu
    Copy the full SHA
    29b6706 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    27c3710 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5b44448 View commit details
    Browse the repository at this point in the history
  4. fix : change trigger port accepted values to 0 or 1. Remove unnecessa…

    …ry internal set function.
    maij committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    549cc42 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    deec1c1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e01f132 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    73c4cae View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0d18947 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2017

  1. Merge pull request #3 from nulinspiratie/feature/signadyne_driver_cla…

    …ssification
    
    Feature/signadyne driver classification
    maij committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    ef0daf0 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'feature/signadyne_driver' into feature/SD_DIG_functions

    Merge pull request #4 from nulinspiratie/feature/SD_DIG_functions
    maij committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    91811f0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    633fd1a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6d16eac View commit details
    Browse the repository at this point in the history
  5. fix: change libraries to newer keysight libs, and use correct method …

    …to import classes from a file
    maij committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    943f8a0 View commit details
    Browse the repository at this point in the history
  6. fix: change top level class for the M3300 card to two separate classe…

    …s for the digitizer and AWG functionality
    maij committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    29c3c63 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2017

  1. fix: indentation in the M3300 card and change library reference to us…

    …e relative addressing.
    maij committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    eacbd60 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3a813ca View commit details
    Browse the repository at this point in the history
  3. fix: change channel triggering to accept correct range of values, als…

    …o replace old variable __analogTriggerMode
    maij committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    d5d6d9a View commit details
    Browse the repository at this point in the history
  4. fix: refer to self for all internal variables, also fix set_points_pe…

    …r_cycle to allow for partial application.
    maij committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    7938313 View commit details
    Browse the repository at this point in the history
  5. refactor: fix whitespace

    maij committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    54bb121 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d267e5f View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2017

  1. Configuration menu
    Copy the full SHA
    b105666 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2017

  1. fix: edit waveform-creating functions to return SD_Wave instances

    Edit waveform-creating functions to actually return SD_Wave instances. Previously they returned only the available onboard RAM and no new SD_Wave object was ever created.
    lgnjanssen authored and lgnjanssen committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    e2cc9de View commit details
    Browse the repository at this point in the history
  2. feat: add default 'name' in result_parser

    Add a default value for `name` i.e. `result`. Previously it needed to be specified in each call of `result_parser`
    lgnjanssen authored and lgnjanssen committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    47746b4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    13a485a View commit details
    Browse the repository at this point in the history
  4. refactor: move pxi-read/write to SD_Module level

    Move pxi-read/write functions to SD_Module level. Previously they were in SD_AWG, but they are shared by all SD_Modules.
    lgnjanssen authored and lgnjanssen committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    a526e5a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a92dfc9 View commit details
    Browse the repository at this point in the history
  6. refactor: deprecate get_trigger_threshold and get_trigger_mode as the…

    …re is no real reason to use a get_cmd rather than get_latest for a purely settable device parameter
    maij committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    f980993 View commit details
    Browse the repository at this point in the history
  7. feat: add FPGA PCport related functions

    Add PCport-read and -write functions at SD_Module level. These are used for communicating with the FPGA PCports.
    lgnjanssen authored and lgnjanssen committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    ec8d44e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    996844b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    385b484 View commit details
    Browse the repository at this point in the history
  10. fix: add missing 'or' operator

    maij committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    73c89f4 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #5 from nulinspiratie/feature/signadyne_digitizer_…

    …integration
    
    Feature/signadyne digitizer integration
    maij committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    ef1380e View commit details
    Browse the repository at this point in the history
  12. Merge pull request #6 from nulinspiratie/feature/signadyne_driver_upd…

    …ates
    
    Small Signadyne driver updates
    maij committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    f2cc7f9 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2017

  1. feat: add basic implementation of Pulseblaster DDS driver. Uses a mod…

    …ified spinapi to include DDS functions in the C lib.
    maij committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    f9c4116 View commit details
    Browse the repository at this point in the history