Fix / driver / mercury ips / firmware 2.6 #1385
Merged
Conversation
This file contains 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
WilliamHPNielsen
force-pushed
the
fix/driver/MercuryiPS/firmware_2.6
branch
from
3b4c36b to
e72d45e
Compare
Codecov Report
@@ Coverage Diff @@
## master #1385 +/- ##
=======================================
Coverage 73.38% 73.38%
=======================================
Files 79 79
Lines 9282 9282
=======================================
Hits 6812 6812
Misses 2470 2470 |
|
Codacy found a single trailing whitespace. Once that it fixed I think this is ready to go. Edit: I did this from the web interface |
jenshnielsen
approved these changes
Nov 19, 2018
jenshnielsen
requested changes
Nov 19, 2018
astafan8
approved these changes
Nov 19, 2018
| Returns True if any axis has a ramp status that is either 'TO SET' or | ||
| 'TO ZERO' | ||
| """ | ||
| ramping_statuus = ['TO SET', 'TO ZERO'] |
There was a problem hiding this comment.
It's plural in Latin, you uncultured peasant.
There was a problem hiding this comment.
sorry that you have to work with such ignorant people ;)
There was a problem hiding this comment.
you should defintley use some utf-8 here: ramping_statūs ;-)
Co-Authored-By: WilliamHPNielsen <[email protected]>
Co-Authored-By: WilliamHPNielsen <[email protected]>
jenshnielsen
approved these changes
Nov 19, 2018
giulioungaretti
pushed a commit
that referenced
this pull request
Nov 19, 2018
Merge: a8baf7a 950cfce Author: Jens Hedegaard Nielsen <[email protected]> Merge pull request #1385 from WilliamHPNielsen/fix/driver/MercuryiPS/firmware_2.6
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The SCPI (like) API for the Mercury iPS changed between firmware versions 2.5 and 2.6
Changes proposed in this pull request:
@QCoDeS/core