Add types to remaining drivers

src/qcodes/instrument_drivers/weinschel/Weinschel_8320.py

@@ -1,11 +1,14 @@
-from typing import Any
+from typing import TYPE_CHECKING
 
 import numpy as np
 
 from qcodes import validators as vals
-from qcodes.instrument import VisaInstrument
+from qcodes.instrument import VisaInstrument, VisaInstrumentKWArgs
 from qcodes.parameters import Parameter
 
+if TYPE_CHECKING:
+    from typing_extensions import Unpack
+
 
 class Weinschel8320(VisaInstrument):
     """
@@ -14,8 +17,12 @@ class Weinschel8320(VisaInstrument):
     Weinschel is formerly known as Aeroflex/Weinschel
     """
 
-    def __init__(self, name: str, address: str, **kwargs: Any):
-        super().__init__(name, address, terminator='\r', **kwargs)
+    default_terminator = "\r"
+
+    def __init__(
+        self, name: str, address: str, **kwargs: "Unpack[VisaInstrumentKWArgs]"
+    ):
+        super().__init__(name, address, **kwargs)
         self.attenuation = Parameter(
             "attenuation",
             unit="dB",

src/qcodes/instrument_drivers/yokogawa/GS200.py

@@ -4,12 +4,20 @@
 """
 
 from functools import partial
-from typing import Any, Literal, Optional, Union
-
-from qcodes.instrument import InstrumentChannel, VisaInstrument
+from typing import TYPE_CHECKING, Literal, Optional, Union
+
+from qcodes.instrument import (
+    InstrumentBaseKWArgs,
+    InstrumentChannel,
+    VisaInstrument,
+    VisaInstrumentKWArgs,
+)
 from qcodes.parameters import DelegateParameter
 from qcodes.validators import Bool, Enum, Ints, Numbers
 
+if TYPE_CHECKING:
+    from typing_extensions import Unpack
+
 ModeType = Literal["CURR", "VOLT"]
 
 
@@ -46,8 +54,14 @@ class GS200_Monitor(InstrumentChannel):
         present
     """
 
-    def __init__(self, parent: "GS200", name: str, present: bool) -> None:
-        super().__init__(parent, name)
+    def __init__(
+        self,
+        parent: "GS200",
+        name: str,
+        present: bool,
+        **kwargs: "Unpack[InstrumentBaseKWArgs]",
+    ) -> None:
+        super().__init__(parent, name, **kwargs)
 
         self.present = present
 
@@ -186,8 +200,13 @@ def update_measurement_enabled(self, unit: ModeType, output_range: float) -> Non
 class GS200Program(InstrumentChannel):
     """ """
 
-    def __init__(self, parent: "GS200", name: str) -> None:
-        super().__init__(parent, name)
+    def __init__(
+        self,
+        parent: "GS200",
+        name: str,
+        **kwargs: "Unpack[InstrumentBaseKWArgs]",
+    ) -> None:
+        super().__init__(parent, name, **kwargs)
         self._repeat = 1
         self._file_name = None
 
@@ -266,13 +285,17 @@ class GS200(VisaInstrument):
       name: What this instrument is called locally.
       address: The GPIB or USB address of this instrument
       kwargs: kwargs to be passed to VisaInstrument class
-      terminator: read terminator for reads/writes to the instrument.
     """
 
+    default_terminator = "\n"
+
     def __init__(
-        self, name: str, address: str, terminator: str = "\n", **kwargs: Any
+        self,
+        name: str,
+        address: str,
+        **kwargs: "Unpack[VisaInstrumentKWArgs]",
     ) -> None:
-        super().__init__(name, address, terminator=terminator, **kwargs)
+        super().__init__(name, address, **kwargs)
 
         self.add_parameter(
             "output",

src/qcodes/instrument_drivers/yokogawa/Yokogawa_GS200.py

@@ -2,6 +2,7 @@
 from typing import TYPE_CHECKING, Literal, Optional, Union
 
 from qcodes.instrument import (
+    InstrumentBaseKWArgs,
     InstrumentChannel,
     VisaInstrument,
     VisaInstrumentKWArgs,
@@ -48,8 +49,14 @@ class YokogawaGS200Monitor(InstrumentChannel):
         present
     """
 
-    def __init__(self, parent: "YokogawaGS200", name: str, present: bool) -> None:
-        super().__init__(parent, name)
+    def __init__(
+        self,
+        parent: "YokogawaGS200",
+        name: str,
+        present: bool,
+        **kwargs: "Unpack[InstrumentBaseKWArgs]",
+    ) -> None:
+        super().__init__(parent, name, **kwargs)
 
         self.present = present
 
@@ -188,8 +195,13 @@ def update_measurement_enabled(self, unit: ModeType, output_range: float) -> Non
 class YokogawaGS200Program(InstrumentChannel):
     """ """
 
-    def __init__(self, parent: "YokogawaGS200", name: str) -> None:
-        super().__init__(parent, name)
+    def __init__(
+        self,
+        parent: "YokogawaGS200",
+        name: str,
+        **kwargs: "Unpack[InstrumentBaseKWArgs]",
+    ) -> None:
+        super().__init__(parent, name, **kwargs)
         self._repeat = 1
         self._file_name = None