Skip to content

Add new DSO functions #253

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.

Sign up for GitHub

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

Open
Jasper-Harvey0 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add new DSO functions #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5885c4
Update release notes.
Jasper-Harvey0 Mar 11, 2026
5cfca54
Add invert function.
Jasper-Harvey0 Mar 11, 2026
41dddbe
Add invert function, and vtime function
Jasper-Harvey0 Mar 12, 2026
02dce63
Update release notes.
Jasper-Harvey0 Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/release-notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Improvements
- Created a new FixateError base class for all exceptions raised by fixate to use. It inherits from Exception instead of BaseExcepetion to improve error handling.
- DSO Driver function 'waveform_values' now returns a single channels x and y data as two separate lists, without re-acquiring the signal. This function should
now be called after performing signal acquisition.
- Invert channel and vtime funcitons implemented in the DSO driver.

*************
Version 0.6.4
Expand Down
9 changes: 9 additions & 0 deletions src/fixate/drivers/dso/agilent_mso_x.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ def __init__(self, instrument):
("ch2.offset", self.write, "CHAN2:OFFS {value}"),
("ch3.offset", self.write, "CHAN3:OFFS {value}"),
("ch4.offset", self.write, "CHAN4:OFFS {value}"),
("ch1.invert", self.write, "CHAN1:INV {value:n}"),
("ch2.invert", self.write, "CHAN2:INV {value:n}"),
("ch3.invert", self.write, "CHAN3:INV {value:n}"),
("ch4.invert", self.write, "CHAN4:INV {value:n}"),
("ch1.coupling.ac", self.write, "CHAN1:COUP AC"),
("ch2.coupling.ac", self.write, "CHAN2:COUP AC"),
("ch3.coupling.ac", self.write, "CHAN3:COUP AC"),
Expand Down Expand Up @@ -124,6 +128,11 @@ def __init__(self, instrument):
self.query_after_acquire,
"MEAS:VRAT? DISP,{self._store[source1]},{self._store[source2]}",
),
(
"measure.vtime",
self.query_after_acquire,
"MEAS:VTIM? {time}, CHAN{channel:n}",
),
# Ch1 Measure
("measure.counter.ch1", self.query_after_acquire, "MEAS:COUN? CHAN1"),
("measure.duty.ch1", self.query_after_acquire, "MEAS:DUTY? CHAN1"),
Expand Down
10 changes: 10 additions & 0 deletions src/fixate/drivers/dso/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,16 @@ def __init__(self):
self.xmax = MeasureAllSources()
self.xmin = MeasureAllSources()

def vtime(self, time: float, channel: int):
Copy link
Collaborator

@jcollins1983 jcollins1983 Mar 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks the methodology used in definin all the other functions, but it's easier to understand since you don't have to go to a million other places to see what's going on, so I'm not opposed to the break in paradigm.
I'm assuming that implementing this is what led you to make the changes in #255

"""
Return the y value of a channel at the requested time.
"""
raise InstrumentFeatureUnavailable(
"{} not available on this device".format(
inspect.currentframe().f_code.co_name
)
)


class MultiSlopes(CallableNoArgs):
def __init__(self):
Expand Down
Loading