Repository navigation
Yokogawa annotations #8697
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
Merged
Jens Hedegaard Nielsen (jenshnielsen)
merged 14 commits into
microsoft:main
from
jenshnielsen:yokogawa_annotations
Nov 16, 2026
Merged
Yokogawa annotations #8697
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
cedf9d2
Split GS200 output level getter and setter
jenshnielsen 8e389f2
Add value types to remaining Yokogawa GS200 parameters
jenshnielsen d0f332b
Fix units of Yokogawa GS200 current parameters
jenshnielsen 5bbadb0
Add newsfragments for #8697
jenshnielsen 075e1d6
Read back GS200 program count after setting a keyword in test
jenshnielsen c3db29e
Extend Yokogawa GS200 test coverage
jenshnielsen 6bc879a
Fix software ramps with YokogawaGS200.ramp_voltage/ramp_current
jenshnielsen 1bc931c
Use seconds for the Yokogawa GS200 measurement delay
jenshnielsen c4ef7af
Add GS200 ramp and measurement delay fixes to newsfragments
jenshnielsen 40fb50e
Check GS200 software ramp target before stepping
jenshnielsen cfbc840
Add status responses to the simulated GS200 with /MON option
jenshnielsen 32fc11f
Mention GS200 software ramp range check in newsfragment
jenshnielsen 255adf9
Require a positive step for GS200 ramp_voltage/ramp_current software …
jenshnielsen 24e2537
Mention GS200 software ramp step requirement in newsfragment
jenshnielsen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| The ``current``, ``current_range`` and ``current_limit`` parameters of the ``YokogawaGS200``, | ||
| and its ``measure`` parameter in voltage source mode, now use the unit ``A`` instead of ``I``. | ||
| The ``ramp_rate`` and ``ramp_step`` parameters now start with the units ``A/s`` and ``A`` | ||
| instead of ``V/s`` and ``V`` if the instrument is in current source mode when connecting, as | ||
| they already did after changing the source mode. | ||
|
|
||
| ``YokogawaGS200Monitor.delay`` (``measure.delay``) is now in seconds, the unit the instrument | ||
| uses, instead of ms. The value was already sent to the instrument unconverted, so | ||
| ``delay(500)`` set a delay of 500 s despite the ``ms`` unit. The parameter now accepts values | ||
| from 0 to 999.999 s in steps of 1 ms, e.g. ``delay(0.5)`` for 500 ms, and returns the delay | ||
| as a ``float`` in seconds instead of an ``int`` rounded to whole seconds. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| The remaining parameters of the ``YokogawaGS200`` driver are now annotated with the type of | ||
| their value, e.g. ``Parameter[float, Self]``. ``YokogawaGS200Program.count`` is annotated as | ||
| ``int | Literal["MIN", "MAX"]``: it can be set to ``"MIN"`` or ``"MAX"``, and getting it | ||
| always returns an integer, but until it is read again the cached value is the keyword that was | ||
| set. The status register parameters return the ``StatusByte``, ``StandardEventRegister``, | ||
| ``ExtendedEventRegister`` and ``ConditionRegister`` flags as before, and are now annotated as | ||
| such. | ||
|
|
||
| Fixed the following driver bugs found along the way: | ||
|
|
||
| - ``YokogawaGS200.ramp_voltage`` and ``ramp_current`` raised a ``TypeError`` when called with | ||
| ``ramp_mode="SOFTWARE"``. They now perform the software ramp, and raise a ``ValueError`` if | ||
| ``ramp_step`` is 0, which would otherwise jump directly to the target. | ||
| - A software ramp of the ``YokogawaGS200`` to a target outside the output range of the present | ||
| source range now raises before changing the output. Previously it stepped up to the limit of | ||
| the range before raising. |
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.