Merge pull request analogdevicesinc#549 from tagoylo/ad7124-fix

adi/ad7124.py

@@ -36,7 +36,7 @@ def __init__(self, uri="", device_index=0):
                 else:
                     index += 1
 
-        self._rx_channel_names = [chan.name for chan in self._ctrl.channels]
+        self._rx_channel_names = [chan.id for chan in self._ctrl.channels]
         if "-" in self._rx_channel_names[0]:
             self._rx_channel_names.sort(key=lambda x: int(x[7:].split("-")[0]))
         else:

examples/ad7124.py

@@ -2,25 +2,56 @@
 #
 # SPDX short identifier: ADIBSD
 
+import argparse
+
 import adi
 import matplotlib.pyplot as plt
 import numpy as np
 from scipy import signal
 
 # Set up AD7124
-ad7124 = adi.ad7124(uri="ip:10.48.65.138")
-ad_channel = 0
+# Optionally pass URI as command line argument with -u option,
+# else use default to "ip:analog.local"
+parser = argparse.ArgumentParser(description="AD7124 Example Script")
+parser.add_argument(
+    "-u",
+    default=["ip:analog.local"],
+    help="-u (arg) URI of target device's context, eg: 'ip:analog.local',\
+    'ip:192.168.2.1',\
+    'serial:COM4,115200,8n1n'",
+    action="store",
+    nargs="*",
+)
+args = parser.parse_args()
+my_uri = args.u[0]
+
+print("uri: " + str(my_uri))
+
+ad7124 = adi.ad7124(uri=my_uri)
+ad_channel0 = 0  # voltage0-voltage1 plug to CH1 on my m2k
+ad_channel1 = 1  # voltage2-voltage3 plug to CH2 on my m2k
 
 sc = ad7124.scale_available
 
-ad7124.channel[ad_channel].scale = sc[-1]  # get highest range
+ad7124.channel[ad_channel0].scale = sc[-1]  # get highest range
+ad7124.channel[ad_channel1].scale = sc[-1]  # get highest range
 ad7124.rx_output_type = "SI"
 # sets sample rate for all channels
 ad7124.sample_rate = 19200
-ad7124.rx_enabled_channels = [ad_channel]
+ad7124.rx_enabled_channels = [ad_channel0, ad_channel1]
 ad7124.rx_buffer_size = 100
+ad7124._ctx.set_timeout(100000)
 
-raw = ad7124.channel[0].raw
 data = ad7124.rx()
 
 print(data)
+
+plt.figure(1)
+plt.title(f"{ad7124._ctrl.name} @{ad7124.sample_rate}sps")
+plt.ylabel("Volts")
+plt.xlabel("Sample Number")
+plt.plot(data[0], label=ad7124.channel[ad_channel0].name, color="orange", linewidth=2)
+plt.plot(data[1], label=ad7124.channel[ad_channel1].name, color="blue", linewidth=2)
+plt.show()
+
+del ad7124