Skip to content

Comments

Docstring modifications#207

Merged
scasagrande merged 1 commit intodevelopfrom
docstring_update
Feb 15, 2019
Merged

Docstring modifications#207
scasagrande merged 1 commit intodevelopfrom
docstring_update

Conversation

@scasagrande
Copy link
Contributor

Changes

  • A few docstring updates for the MHS5200a that I missed.

@scasagrande scasagrande merged commit b59a45a into develop Feb 15, 2019
@scasagrande scasagrande deleted the docstring_update branch February 15, 2019 04:34
@coveralls
Copy link

Coverage Status

Coverage remained the same at 86.729% when pulling f580740 on docstring_update into e05dad5 on develop.

scasagrande added a commit that referenced this pull request Feb 19, 2019
* Drop support for Python 3.4 (#200)

* Fix issue #197 (#201)

Where checking if value is in enum will raise value error in Py38

* 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

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

* Fix bug with SCPIFunctionGenerator.function, add tests

* Fix linting

* Fix Agilent 33220a, add tests (#203)

* 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

* 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

* Docstring modifications (#207)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants