Rigol asign modules to attributes

Author: jenshnielsen

src/qcodes/instrument/channel.py

@@ -5,7 +5,9 @@
 import sys
 import warnings
 from collections.abc import Callable, Iterable, Iterator, MutableSequence, Sequence
-from typing import TYPE_CHECKING, Any, Generic, TypeVar, cast, overload
+from typing import TYPE_CHECKING, Any, Generic, cast, overload
+
+from typing_extensions import TypeVar
 
 from qcodes.metadatable import MetadatableWithName
 from qcodes.parameters import (

src/qcodes/instrument_drivers/rigol/Rigol_DG1062.py

@@ -4,12 +4,12 @@
 
 from qcodes import validators as vals
 from qcodes.instrument import (
-    ChannelList,
     InstrumentBaseKWArgs,
     InstrumentChannel,
     VisaInstrument,
     VisaInstrumentKWArgs,
 )
+from qcodes.instrument.channel import ChannelTuple
 from qcodes.utils import partial_with_docstring
 
 if TYPE_CHECKING:
@@ -20,7 +20,7 @@
 log = logging.getLogger(__name__)
 
 
-class RigolDG1062Burst(InstrumentChannel):
+class RigolDG1062Burst(InstrumentChannel["RigolDG1062"]):
     """
     Burst commands for the DG1062. We make a separate channel for these to
     group burst commands together.
@@ -262,7 +262,8 @@ def __init__(
         """
 
         burst = RigolDG1062Burst(self.parent, "burst", self.channel)
-        self.add_submodule("burst", burst)
+        self.burst: RigolDG1062Burst = self.add_submodule("burst", burst)
+        """"Burst submodule"""
 
         # We want to be able to do the following:
         # >>> help(gd.channels[0].sin)
@@ -413,13 +414,20 @@ def __init__(
     ):
         super().__init__(name, address, **kwargs)
 
-        channels = ChannelList(self, "channel", RigolDG1062Channel, snapshotable=False)
-
-        for ch_num in [1, 2]:
-            ch_name = f"ch{ch_num}"
-            channel = RigolDG1062Channel(self, ch_name, ch_num)
-            channels.append(channel)
-            self.add_submodule(ch_name, channel)
-
-        self.add_submodule("channels", channels.to_channel_tuple())
+        self.ch1 = self.add_submodule("ch1", RigolDG1062Channel(self, "ch1", 1))
+        """Channel 1 submodule"""
+        self.ch2 = self.add_submodule("ch2", RigolDG1062Channel(self, "ch2", 2))
+        """Channel 2 submodule"""
+
+        self.channels: ChannelTuple[RigolDG1062Channel] = self.add_submodule(
+            "channels",
+            ChannelTuple(
+                self,
+                "channel",
+                chan_type=RigolDG1062Channel,
+                chan_list=(self.ch1, self.ch2),
+                snapshotable=False,
+            ),
+        )
+        """Tuple of channels"""
         self.connect_message()