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

Update srsdg645.py #219

Merged
merged 4 commits into from
Jan 2, 2020
Merged

Update srsdg645.py #219

merged 4 commits into from
Jan 2, 2020

Conversation

trappitsch
Copy link
Contributor

Added capabilities to SRS DG645 instrument:
Added the capability to set the level offset for each output. Used the exact same formalism as in level_amplitude subroutine.

Added the capability to set the level offset for each output. Used the exact same formalism as in level_amplitude subroutine.
@scasagrande
Copy link
Contributor

So sorry!! I had forgotten to move my 2FA to my new phone and my laptop web session timed out haha.

If we can just get a quick test added to instruments/tests/test_srs/test_srsdg645.py that'll be perfect for this. That way then I can update things to use the property factories in the future.

Added the testcase
@trappitsch
Copy link
Contributor Author

Sorry, I was on vacation, but back now. I added the quick test case, as well as I understood it from the documentation. Let me know if I got it completely wrong or if it fits with what you wanted, I'm fairly new to this :)

Thanks!

@trappitsch
Copy link
Contributor Author

trappitsch commented Oct 23, 2019

@scasagrande: I'm not fully clear why the checks have failed. I probably don't understand all that well on how these are done. Any hints / ideas would be very much appreciated. Thanks!

The travis error log for all python version states:
The command "pytest --version" failed and exited with 1 during .

@scasagrande
Copy link
Contributor

Your tests look good to me! The CI failure isn't your fault. It looks like one of my dependencies was updated upstream and is now having issues. I'll have to fix that then I can merge in your work :)

@trappitsch
Copy link
Contributor Author

Great, thanks for checking. I'll leave it in your hands then. Let me know if I can do anything. I'm planning on implementing more controls on this specific DG in the future, so more to come hopefully soon.

@scasagrande
Copy link
Contributor

I finally got off my butt and fixed the build! I'm going to go ahead and merge your work. Thanks for the submission :)

@scasagrande scasagrande merged commit fb86f04 into instrumentkit:master Jan 2, 2020
@trappitsch trappitsch deleted the srsdg645_additions branch January 2, 2020 16:40
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