Skip to content

Set offset after impedance so that it is properly adjusted #411

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

Merged
nfelt14 merged 6 commits into from
Apr 4, 2025
Merged

Set offset after impedance so that it is properly adjusted #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6876b3b
fix: set offset after impedance in afg's set_function_properties to p…
lekevin678 Apr 4, 2025
9053eab
fix: set frequency after function in afg's set_function_properties to…
lekevin678 Apr 4, 2025
0edb2cb
docs: updated changelog;
lekevin678 Apr 4, 2025
f6fff47
fix: reverting function/frequency change;
lekevin678 Apr 4, 2025
8bfb88e
docs: added fixed sub-section
lekevin678 Apr 4, 2025
192681b
docs: added back unreleased sentence
lekevin678 Apr 4, 2025
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ Valid subsections within a version are:

Things to be included in the next release go here.

### Fixed

- Fixed a bug in `set_function_properties` in the drivers for the internal AFG of the TekScope that could cause the offset value to change after setting impedance.

---

## v3.1.9 (2025-04-03)
Expand Down
4 changes: 2 additions & 2 deletions src/tm_devices/drivers/scopes/tekscope/tekscope.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,8 +1071,6 @@ def set_function_properties( # noqa: PLR0913 # pyright: ignore[reportIncompati
# Generate the waveform from the Internal AFG
# Frequency
self.set_frequency(frequency)
# Offset
self.set_offset(offset)
# Function
self.set_function(function)
# Duty Cycle
Expand All @@ -1085,6 +1083,8 @@ def set_function_properties( # noqa: PLR0913 # pyright: ignore[reportIncompati
self.set_impedance(termination)
# Amplitude, needs to be after termination so that the amplitude is properly adjusted
self.set_amplitude(amplitude)
# Offset, needs to be after termination so that the offset is properly adjusted
self.set_offset(offset)

def set_amplitude(self, value: float, absolute_tolerance: float = 0) -> None:
"""Set the amplitude on the internal AFG.
Expand Down
Loading