-
Notifications
You must be signed in to change notification settings - Fork 71
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
Commits on Feb 7, 2019
-
Configuration menu - View commit details
-
Copy full SHA for fad35d1 - Browse repository at this point
Copy the full SHA fad35d1View commit details
Commits on Feb 8, 2019
-
Where checking if value is in enum will raise value error in Py38
Configuration menu - View commit details
-
Copy full SHA for c081174 - Browse repository at this point
Copy the full SHA c081174View commit details
Commits on Feb 10, 2019
-
* 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
Configuration menu - View commit details
-
Copy full SHA for ca5fb15 - Browse repository at this point
Copy the full SHA ca5fb15View commit details
Commits on Feb 11, 2019
-
Fix bug with SCPIFunctionGenerator.function, add tests (#202)
* Fix bug with SCPIFunctionGenerator.function, add tests * Fix linting
Configuration menu - View commit details
-
Copy full SHA for 6aa0024 - Browse repository at this point
Copy the full SHA 6aa0024View commit details -
Configuration menu - View commit details
-
Copy full SHA for 13845c9 - Browse repository at this point
Copy the full SHA 13845c9View commit details
Commits on Feb 14, 2019
-
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
Configuration menu - View commit details
-
Copy full SHA for 7ccdc13 - Browse repository at this point
Copy the full SHA 7ccdc13View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for e05dad5 - Browse repository at this point
Copy the full SHA e05dad5View commit details
Commits on Feb 15, 2019
-
Configuration menu - View commit details
-
Copy full SHA for b59a45a - Browse repository at this point
Copy the full SHA b59a45aView commit details
Commits on Feb 19, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 215d29a - Browse repository at this point
Copy the full SHA 215d29aView commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.