Skip to content

Commit

Permalink
Merge pull request #6293 from konosubakonoakua/main
Browse files Browse the repository at this point in the history
Keysight Infiniium: feat: add input (coupling & impedance) for channels
  • Loading branch information
jenshnielsen authored Jul 30, 2024
2 parents 5f2cdc0 + 040d610 commit 9a36022
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion src/qcodes/instrument_drivers/Keysight/Infiniium.py
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,24 @@ def __init__(
self._channel = channel

super().__init__(parent, name, **kwargs)

# input
# On MXR/EXR-Series oscilloscopes:
# DC — DC coupling, 1 MΩ impedance.
# DC50 | DCFifty — DC coupling, 50Ω impedance.
# AC — AC coupling, 1 MΩ impedance.
# LFR1 | LFR2 — AC 1 MΩ input impedance.
# When no probe is attached, the coupling for each channel can be AC, DC, DC50, or DCFifty.
# If you have an 1153A probe attached, the valid parameters are DC, LFR1, and LFR2 (low-frequency reject).
self.input: Parameter = Parameter(
name="input",
instrument=self,
label=f"Channel {channel} input coupling & impedance",
set_cmd=f"CHAN{channel}:INP {{}}",
get_cmd=f"CHAN{channel}:INP?",
vals=vals.Enum("DC", "DC50", "AC", "LFR1", "LFR2"),
)

# display
self.display: Parameter = Parameter(
name="display",
Expand Down Expand Up @@ -927,7 +945,7 @@ def __init__(
set_cmd=":TRIGger:EDGE:SOURce {}",
vals=vals.Enum(
*(
[f"CHAN{i}" for i in range(1, 4 + 1)]
[f"CHAN{i}" for i in range(1, self.no_channels + 1)]
+ [f"DIG{i}" for i in range(16 + 1)]
+ ["AUX", "LINE"]
)
Expand Down

0 comments on commit 9a36022

Please sign in to comment.