Merge pull request #530 from analogdevicesinc/tfcollins/gen-class-fix

Fix dynamic channel config classes
analogdevicesinc · Feb 12, 2024 · f5e8477 · f5e8477
2 parents a240ae4 + 64990d5
commit f5e8477
Show file tree

Hide file tree

Showing 27 changed files with 43 additions and 4 deletions.
diff --git a/adi/ad4110.py b/adi/ad4110.py
@@ -45,6 +45,8 @@ def __init__(self, uri="", device_name=""):
         if not self._rxadc:
             raise Exception("Error in selecting matching device")
 
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/ad4130.py b/adi/ad4130.py
@@ -40,6 +40,8 @@ def __init__(self, uri="", device_name=""):
                 self._rxadc = device
                 break
 
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/ad469x.py b/adi/ad469x.py
@@ -51,6 +51,7 @@ def __init__(self, uri="", device_name=""):
         if not self._rxadc:
             raise Exception("Error in selecting matching device")
 
+        self._rx_channel_names = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/ad4858.py b/adi/ad4858.py
@@ -45,6 +45,8 @@ def __init__(self, uri="", device_name=""):
         if not self._rxadc:
             raise Exception("Error in selecting matching device")
 
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/ad5686.py b/adi/ad5686.py
@@ -61,6 +61,7 @@ def __init__(self, uri="", device_index=0):
                 else:
                     index += 1
 
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch.id
             self.channel.append(self._channel(self._ctrl, name))

diff --git a/adi/ad5754r.py b/adi/ad5754r.py
@@ -47,6 +47,8 @@ def __init__(self, uri="", device_name=""):
             raise Exception("Error in selecting matching device")
 
         self.output_bits = []
+        self.channel = []
+        self._tx_channel_names = []
         for ch in self._ctrl.channels:
             name = ch.id
             self.output_bits.append(ch.data_format.bits)

diff --git a/adi/ad578x.py b/adi/ad578x.py
@@ -54,6 +54,8 @@ def __init__(self, uri="", device_name=""):
             raise Exception("Error in selecting matching device")
 
         self.output_bits = []
+        self.channel = []
+        self._tx_channel_names = []
         for ch in self._ctrl.channels:
             name = ch.id
             self.output_bits.append(ch.data_format.bits)

diff --git a/adi/ad5940.py b/adi/ad5940.py
@@ -33,6 +33,7 @@ def __init__(self, uri=""):
                 break
         # dynamically get channels
         _channels = []
+        self._rx_channel_names = []
         for ch in self._ctrl.channels:
             self._rx_channel_names.append(ch.id)
             if ch.name == "bia":

diff --git a/adi/ad717x.py b/adi/ad717x.py
@@ -59,6 +59,8 @@ def __init__(self, uri="", device_name=""):
         if not self._rxadc:
             raise Exception("Error in selecting matching device")
 
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/ad719x.py b/adi/ad719x.py
@@ -46,6 +46,8 @@ def __init__(self, uri="", device_name=""):
         if not self._rxadc:
             raise Exception("Error in selecting matching device")
 
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/ad7606.py b/adi/ad7606.py
@@ -48,6 +48,8 @@ def __init__(self, uri="", device_name=""):
                 self._rxadc = device
                 break
 
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/ad7689.py b/adi/ad7689.py
@@ -44,6 +44,8 @@ def __init__(self, uri="", device_name=""):
                 self._rxadc = device
                 break
 
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/ad7746.py b/adi/ad7746.py
@@ -41,6 +41,7 @@ def __init__(self, uri="", device_name=""):
                 break
         # dynamically get channels
         _channels = []
+        self._rx_channel_names = []
         for ch in self._ctrl.channels:
             self._rx_channel_names.append(ch.id)
             if "capacitance" in ch.id:

diff --git a/adi/ad7768.py b/adi/ad7768.py
@@ -35,6 +35,7 @@ def __init__(
         if not self._rxadc:
             raise Exception("Error in selecting matching device")
 
+        self._rx_channel_names = []
         for ch in self._rxadc.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/ad777x.py b/adi/ad777x.py
@@ -46,6 +46,8 @@ def __init__(self, uri="", device_name=""):
         if not self._rxadc:
             raise Exception("Error in selecting matching device")
 
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/ad7799.py b/adi/ad7799.py
@@ -21,6 +21,7 @@ def __init__(self, uri=""):
 
         self._rxadc = self._ctx.find_device("AD7799")
 
+        self.channel = []
         for name in self._rx_channel_names:
             self.channel.append(self._channel(self._rxadc, name))
 

diff --git a/adi/ad9083.py b/adi/ad9083.py
@@ -25,6 +25,7 @@ def __init__(self, uri=""):
         if not self._rxadc:
             raise Exception("Cannot find device axi-ad9083-rx-hpc")
 
+        self._rx_channel_names = []
         for ch in self._rxadc.channels:
             if ch.scan_element and not ch.output:
                 self._rx_channel_names.append(ch._id)

diff --git a/adi/ad9172.py b/adi/ad9172.py
@@ -25,6 +25,7 @@ def __init__(self, uri=""):
         if not self._txdac:
             raise RuntimeError("Could not find axi-ad9172-hpc")
 
+        self._tx_channel_names = []
         for chan in self._txdac.channels:
             if (
                 hasattr(chan, "scan_element")

diff --git a/adi/adaq8092.py b/adi/adaq8092.py
@@ -12,6 +12,8 @@ class adaq8092(rx, context_manager):
     """ADAQ8092 14-Bit, 105MSPS, Dual-Channel uModule Data Acquisition Solution"""
 
     _device_name = "adaq8092"
+    _rx_stack_interleaved = True
+    _rx_data_type = np.int16
 
     def __init__(
         self, uri="",
@@ -27,8 +29,7 @@ def __init__(
             self._rxadc = self._ctx.find_device("cf_axi_adc")
             self._device_name = "cf_axi_adc"
 
-        rx._rx_stack_interleaved = True
-        rx._rx_data_type = np.int16
+        self._rx_channel_names = []
         for ch in self._rxadc.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/adpd1080.py b/adi/adpd1080.py
@@ -34,7 +34,8 @@ def __init__(self, uri="", device_index=0):
 
         # dynamically get channels and sorting them after the color
         # self._ctrl.channels.sort(key=lambda x: str(x.id[14:]))
-
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl._channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/adpd188.py b/adi/adpd188.py
@@ -35,7 +35,8 @@ def __init__(self, uri="", device_index=0):
 
         # dynamically get channels and sorting them after the color
         # self._ctrl.channels.sort(key=lambda x: str(x.id[14:]))
-
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl._channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/adpd410x.py b/adi/adpd410x.py
@@ -30,6 +30,7 @@ def __init__(self, uri=""):
 
         self._rxadc = self._ctx.find_device("adpd410x")
 
+        self.channel = []
         for name in self._rx_channel_names:
             self.channel.append(self._channel(self._rxadc, name))
 

diff --git a/adi/ltc2499.py b/adi/ltc2499.py
@@ -24,6 +24,7 @@ def __init__(self, uri=""):
             raise Exception("No device found")
 
         _channels = []
+        self._rx_channel_names = []
         for ch in self._ctrl.channels:
             self._rx_channel_names.append(ch.id)
             _channels.append((ch.id, self._channel(self._ctrl, ch.id)))

diff --git a/adi/ltc2983.py b/adi/ltc2983.py
@@ -27,6 +27,7 @@ def __init__(self, uri=""):
 
         # dynamically get channels
         _channels = []
+        self._rx_channel_names = []
         for ch in self._ctrl.channels:
             self._rx_channel_names.append(ch.id)
             _channels.append((ch.id, self._channel(self._ctrl, ch.id)))

diff --git a/adi/max11205.py b/adi/max11205.py
@@ -47,6 +47,8 @@ def __init__(self, uri="", device_name=""):
         if not self._rxadc:
             raise Exception("Error in selecting matching device")
 
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/max14001.py b/adi/max14001.py
@@ -47,6 +47,8 @@ def __init__(self, uri="", device_name=""):
         if not self._rxadc:
             raise Exception("Error in selecting matching device")
 
+        self._rx_channel_names = []
+        self.channel = []
         for ch in self._ctrl.channels:
             name = ch._id
             self._rx_channel_names.append(name)

diff --git a/adi/max9611.py b/adi/max9611.py
@@ -39,6 +39,7 @@ def __init__(self, uri="", device_name=""):
             raise Exception("Error in selecting matching device")
 
         # Dynamically get channels after the index
+        self._rx_channel_names = []
         for ch in self._ctrl.channels:
             name = ch._id