Skip to content
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
1 change: 1 addition & 0 deletions docs/changes/newsfragments/7837.improved_driver
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add hold parameter, force_jump parameter, and set_event_jump method to the Tektronix AWG70000A driver for improved sequence control.
1 change: 1 addition & 0 deletions docs/changes/newsfragments/7838.improved_driver
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add TektronixDPOAcquisition, TektronixDPOCursor, and TektronixDPOMeasurementImmediate modules to the Tektronix DPO7200xx driver. Enhanced TektronixDPOTrigger with ready, state, and level parameters. Added coupling parameter to TektronixDPOChannel.
42 changes: 39 additions & 3 deletions src/qcodes/instrument_drivers/tektronix/AWG70000A.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import xml.etree.ElementTree as ET
import zipfile as zf
from functools import partial
from typing import TYPE_CHECKING, Any
from typing import TYPE_CHECKING, Any, Literal, Self

import numpy as np
import numpy.typing as npt
Expand Down Expand Up @@ -191,15 +191,26 @@ def __init__(
if channel not in list(range(1, num_channels + 1)):
raise ValueError("Illegal channel value.")

self.state: Parameter = self.add_parameter(
self.state: Parameter[int, Self] = self.add_parameter(
"state",
label=f"Channel {channel} state",
get_cmd=f"OUTPut{channel}:STATe?",
set_cmd=f"OUTPut{channel}:STATe {{}}",
vals=vals.Ints(0, 1),
get_parser=int,
)
"""Parameter state"""
"""Channel State: (OFF: 0, ON: 1)"""

self.hold: Parameter[Literal["FIRST", "ZERO"], Self] = self.add_parameter(
"hold",
label=f"Channel {channel} hold value",
get_cmd=f"OUTPut{channel}:WVALUE:ANALOG:STATE?",
set_cmd=f"OUTPut{channel}:WVALUE:ANALOG:STATE {{}}",
vals=vals.Enum("FIRST", "ZERO"),
)
""" the output condition of a waveform of the specified
channel to hold while the instrument is in the waiting-for-trigger state.
ZERO = 0V, FIRST = first value of next sequence"""

##################################################
# FGEN PARAMETERS
Expand Down Expand Up @@ -587,6 +598,14 @@ def __init__(
)
"""Parameter all_output_off"""

self.force_jump: Parameter[int, Self] = self.add_parameter(
"force_jump",
label="Force Jump",
set_cmd="SOURCE1:JUMP:FORCE {}",
vals=vals.Ints(1, 16383),
)
"""Parameter force_jump"""

add_channel_list = self.num_channels > 2
# We deem 2 channels too few for a channel list
if add_channel_list:
Expand Down Expand Up @@ -619,6 +638,23 @@ def __init__(

self.connect_message()

def set_event_jump(
self, sequence_name: str, current_step: int, next_step: int
) -> None:
"""
Set event jump for a given step in the sequence

Args:
sequence_name: The name of the sequence
current_step: The step number in the sequence (1-indexed)
next_step: The step number to jump to (1-indexed)

"""

self.write(
f"SLISt:SEQuence:STEP{current_step}:EJUMp {sequence_name}, {next_step}"
)

def force_triggerA(self) -> None:
"""
Force a trigger A event
Expand Down
Loading
Loading