Merged
Conversation
Adds clock_source and ref_source parameters Also added a change to the get parser of the lowpass filter setting. The value 9.9e37 corresponds to infinity but can give problems when sending it over a port (such as to pyqtgraph).
Contributor
|
I've noticed that all Keithley/Tektronik instruments signal an out-of-range value with 9.9e37, maybe would be nice to have it has a general converter for all these instruments. value = float(string) |
Contributor
Author
|
@YakBizzarro , Good point. I made the parser a bit more robust by using the change you proposed. |
Contributor
|
I'll try it out this next week, looks good to me though. |
WilliamHPNielsen
approved these changes
Mar 28, 2017
Contributor
WilliamHPNielsen
left a comment
WilliamHPNielsen
left a comment
There was a problem hiding this comment.
Splendid. This makes a lot of sense. 💃
giulioungaretti
pushed a commit
that referenced
this pull request
Mar 28, 2017
Merge: e11da32 2cded75 Author: William H.P. Nielsen <[email protected]> Merge pull request #538 from DiCarloLab-Delft/AWG_enhancements
giulioungaretti
pushed a commit
that referenced
this pull request
Mar 29, 2017
Merge: e11da32 2cded75 Author: William H.P. Nielsen <[email protected]> Merge pull request #538 from DiCarloLab-Delft/AWG_enhancements
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Fixes #537
Changes proposed in this pull request:
clock_sourceandref_sourceparameters , removed refA motivation for the first change is in #537
A motivation for the second change is that INF is more readable (which is nice), it is the same value under the hood, and the value 9.9e37 caused me trouble when sending it to the monitor. I suspect it will prevent more trouble in the future. Additionally, the manual of the AWG says that this INF setting corresponds to open so the 9.9e37 is really a placeholder value on the 5014 side.
@giulioungaretti @WilliamHPNielsen