Skip to content
Merged
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
31 changes: 20 additions & 11 deletions src/qcodes/instrument_drivers/Keysight/Keysight_B2962A.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Self

from typing_extensions import deprecated

Expand All @@ -9,6 +9,7 @@
VisaInstrument,
VisaInstrumentKWArgs,
)
from qcodes.parameters import create_on_off_val_mapping
from qcodes.utils.deprecate import QCoDeSDeprecationWarning

if TYPE_CHECKING:
Expand Down Expand Up @@ -44,7 +45,7 @@ def __init__(

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

self.source_voltage: Parameter = self.add_parameter(
self.source_voltage: Parameter[float, Self] = self.add_parameter(
"source_voltage",
label=f"Channel {chan} Voltage",
get_cmd=f"SOURCE{chan:d}:VOLT?",
Expand All @@ -54,7 +55,7 @@ def __init__(
)
"""Parameter source_voltage"""

self.source_current: Parameter = self.add_parameter(
self.source_current: Parameter[float, Self] = self.add_parameter(
"source_current",
label=f"Channel {chan} Current",
get_cmd=f"SOURCE{chan:d}:CURR?",
Expand All @@ -64,7 +65,7 @@ def __init__(
)
"""Parameter source_current"""

self.voltage: Parameter = self.add_parameter(
self.voltage: Parameter[float, Self] = self.add_parameter(
"voltage",
get_cmd=f"MEAS:VOLT? (@{chan:d})",
get_parser=float,
Expand All @@ -73,7 +74,7 @@ def __init__(
)
"""Parameter voltage"""

self.current: Parameter = self.add_parameter(
self.current: Parameter[float, Self] = self.add_parameter(
"current",
get_cmd=f"MEAS:CURR? (@{chan:d})",
get_parser=float,
Expand All @@ -82,7 +83,7 @@ def __init__(
)
"""Parameter current"""

self.resistance: Parameter = self.add_parameter(
self.resistance: Parameter[float, Self] = self.add_parameter(
"resistance",
get_cmd=f"MEAS:RES? (@{chan:d})",
get_parser=float,
Expand All @@ -91,7 +92,7 @@ def __init__(
)
"""Parameter resistance"""

self.voltage_limit: Parameter = self.add_parameter(
self.voltage_limit: Parameter[float, Self] = self.add_parameter(
"voltage_limit",
get_cmd=f"SENS{chan:d}:VOLT:PROT?",
get_parser=float,
Expand All @@ -101,7 +102,7 @@ def __init__(
)
"""Parameter voltage_limit"""

self.current_limit: Parameter = self.add_parameter(
self.current_limit: Parameter[float, Self] = self.add_parameter(
"current_limit",
get_cmd=f"SENS{chan:d}:CURR:PROT?",
get_parser=float,
Expand All @@ -111,22 +112,30 @@ def __init__(
)
"""Parameter current_limit"""

self.enable: Parameter = self.add_parameter(
self.enable: Parameter[bool, Self] = self.add_parameter(
"enable",
get_cmd=f"OUTP{chan:d}?",
set_cmd=f"OUTP{chan:d} {{:d}}",
val_mapping={"on": 1, "off": 0},
val_mapping=create_on_off_val_mapping(on_val=1, off_val=0),
)
"""Parameter enable"""

self.source_mode: Parameter = self.add_parameter(
self.source_mode: Parameter[str, Self] = self.add_parameter(
"source_mode",
get_cmd=f":SOUR{chan:d}:FUNC:MODE?",
set_cmd=f":SOUR{chan:d}:FUNC:MODE {{:s}}",
val_mapping={"current": "CURR", "voltage": "VOLT"},
)
"""Parameter source_mode"""

self.remote_sensing: Parameter[bool, Self] = self.add_parameter(
"remote_sensing",
get_cmd=f":SENS{chan:d}:REM?",
set_cmd=f":SENS{chan:d}:REM {{:d}}",
val_mapping=create_on_off_val_mapping(on_val=1, off_val=0),
)
"""Parameter remote_sensing"""

self.channel = chan


Expand Down
Loading