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

Driver Improvement: Tektronix AWG7000A #5900

Merged
merged 5 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions docs/changes/newsfragments/5900.improved_driver
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The drivers for ``TektronixAWG5208``, ``TektronixAWG70001A``, ``TektronixAWG70001B``, ``TektronixAWG70002A`` and ``TektronixAWG70002B``
have gained the parameter ``all_output_off`` to disable / enable all outputs as well as the method ``channel.clear_asset`` to clear all asserts on a channel.
16 changes: 16 additions & 0 deletions src/qcodes/instrument_drivers/tektronix/AWG70000A.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

from qcodes import validators as vals
from qcodes.instrument import ChannelList, Instrument, InstrumentChannel, VisaInstrument
from qcodes.parameters import create_on_off_val_mapping

log = logging.getLogger(__name__)

Expand Down Expand Up @@ -388,6 +389,13 @@
f'CASSet:SEQuence "{seqname}"'
f', {tracknr}')

def clear_asset(self) -> None:
"""
Clear asssinged assets on this channel
"""

self.root_instrument.write(f"SOURce{self.channel}:CASSet:CLEAR")

Check warning on line 397 in src/qcodes/instrument_drivers/tektronix/AWG70000A.py

View check run for this annotation

Codecov / codecov/patch

src/qcodes/instrument_drivers/tektronix/AWG70000A.py#L397

Added line #L397 was not covered by tests


AWGChannel = Tektronix70000AWGChannel
"""
Expand Down Expand Up @@ -481,6 +489,14 @@
'Waiting for trigger': '1',
'Running': '2'})

self.add_parameter(
"all_output_off",
label="All Output Off",
get_cmd="OUTPut:OFF?",
set_cmd="OUTPut:OFF {}",
val_mapping=create_on_off_val_mapping(on_val="1", off_val="0"),
)

add_channel_list = self.num_channels > 2
# We deem 2 channels too few for a channel list
if add_channel_list:
Expand Down
Loading