Merge pull request #7866 from jenshnielsen/keithley_typesafe

Small improvments to Keithley drivers

Author: jenshnielsen

src/qcodes/instrument_drivers/Keithley/Keithley_2000.py

@@ -209,8 +209,6 @@ def __init__(
         )
         """Parameter amplitude"""
 
-        self.add_function("reset", call_cmd="*RST")
-
         if reset:
             self.reset()
 
@@ -220,6 +218,9 @@ def __init__(
 
         self.connect_message()
 
+    def reset(self) -> None:
+        self.write("*RST")
+
     def trigger(self) -> None:
         if not self.trigger_continuous():
             self.write("INIT")

src/qcodes/instrument_drivers/Keithley/Keithley_2450.py

@@ -45,7 +45,7 @@ def get_selected(self) -> list[Any] | None:
         return self._user_selected_data
 
 
-class Keithley2450Buffer(InstrumentChannel):
+class Keithley2450Buffer(InstrumentChannel["Keithley2450"]):
     """
     Treat the reading buffer as a submodule, similar to Sense and Source
     """
@@ -379,7 +379,7 @@ def _set_user_delay(self, value: float) -> None:
         self.write(set_cmd)
 
 
-class Keithley2450Source(InstrumentChannel):
+class Keithley2450Source(InstrumentChannel["Keithley2450"]):
     """
     The source module of the Keithley 2450 SMU.
 

src/qcodes/instrument_drivers/Keithley/Keithley_7510.py

@@ -84,7 +84,7 @@ def get_raw(self) -> npt.NDArray:
         return np.linspace(start, stop, n_points)
 
 
-class Keithley7510Buffer(InstrumentChannel):
+class Keithley7510Buffer(InstrumentChannel["Keithley7510"]):
     """
     Treat the reading buffer as a submodule, similar to Sense.
     """
@@ -419,7 +419,7 @@ class _FunctionMode(TypedDict):
     range_vals: Numbers | None
 
 
-class Keithley7510Sense(InstrumentChannel):
+class Keithley7510Sense(InstrumentChannel["Keithley7510"]):
     function_modes: ClassVar[dict[str, _FunctionMode]] = {
         "voltage": {
             "name": '"VOLT:DC"',
@@ -455,7 +455,7 @@ class Keithley7510Sense(InstrumentChannel):
 
     def __init__(
         self,
-        parent: VisaInstrument,
+        parent: "Keithley7510",
         name: str,
         proper_function: str,
         **kwargs: "Unpack[InstrumentBaseKWArgs]",
@@ -630,7 +630,7 @@ def clear_trace(self, buffer_name: str = "defbuffer1") -> None:
         self.write(f":TRACe:CLEar '{buffer_name}'")
 
 
-class Keithley7510DigitizeSense(InstrumentChannel):
+class Keithley7510DigitizeSense(InstrumentChannel["Keithley7510"]):
     """
     The Digitize sense module of the Keithley 7510 DMM.
     """
@@ -649,7 +649,7 @@ class Keithley7510DigitizeSense(InstrumentChannel):
         },
     }
 
-    def __init__(self, parent: VisaInstrument, name: str, proper_function: str) -> None:
+    def __init__(self, parent: "Keithley7510", name: str, proper_function: str) -> None:
         super().__init__(parent, name)
 
         self._proper_function = proper_function