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

Develop -> master for v0.5.0 #209

Merged
merged 9 commits into from
Feb 19, 2019
Merged

Develop -> master for v0.5.0 #209

merged 9 commits into from
Feb 19, 2019

Commits on Feb 7, 2019

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

Commits on Feb 8, 2019

  1. Fix issue #197 (#201)

    Where checking if value is in enum will raise value error in Py38
    scasagrande committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    c081174 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2019

  1. Improvements to APT (#167)

    * Added driver/motor tables for T/KDC001 APT devs.
    
    * Moved TODO comment to avoid pylint error.
    
    * Misc Py3k changes for ThorLabs APT
    
    * motion_timeout for APT motor cmds, fix scale factor
    
    * ThorLabsAPT: Example of new config support.
    
    * More pylint fixes
    
    * Fix for line continuation convention.
    
    * Rearranged imports into standard order.
    
    * Added an APT test. Not working yet.
    
    * Fix linting issues
    
    * New handling in loopback for empty terminator.
    
    * struct.Struct for contents of hw_info packets
    
    * Support for specifying expected apt pkt sizes
    
    * Fixes to APT and APT tests
    
    * Missed a conflict marker.
    
    * Fixed bug due to `if size` falling through on size == 0.
    
    * Removed trailing whitespace.
    
    * Locked requirements.txt; see #174.
    
    * Remove numpy version pinning in requirements.txt
    
    * Add tests to cover additional loopback comm behaviour
    
    * Make pylint happy
    
    * Revert changes to size=0 behaviour in loopback comm
    cgranade authored and scasagrande committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    ca5fb15 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. Fix bug with SCPIFunctionGenerator.function, add tests (#202)

    * Fix bug with SCPIFunctionGenerator.function, add tests
    
    * Fix linting
    scasagrande committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    6aa0024 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    13845c9 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2019

  1. Function Generator single/multi-channel consistency (#206)

    * Function Generator single/multi-channel consistency
    
    * Fix Py27 linting issue
    
    * Fix linting issue
    
    * Add tests for FunctionGenerator abstract instrument
    scasagrande committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    7ccdc13 View commit details
    Browse the repository at this point in the history
  2. Adding support for the minghe mhs5200 (#150)

    * added mhs5200
    
    * added minghe function generator
    
    * added absolute_import
    
    * fixed scaling on frequency
    
    * switched to abstract instrument class
    
    * fixed a few docstrings
    
    * after testing with device
    
    * Minghe MHS5200 - Add instrument to docs
    
    * isolating changes from cc1 test station:
    
    * Revert "isolating changes from cc1 test station:"
    
    This reverts commit 87b8dec.
    
    * reverting changes and fixing duty cycle
    
    * Update for new FunctionGenerator multichannel consistency update
    CatherineH authored and scasagrande committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    e05dad5 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2019

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

Commits on Feb 19, 2019

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