From 4352b32f9a6a3e6151bb45143e7631d2eb273f8b Mon Sep 17 00:00:00 2001 From: Janani Sunil Date: Fri, 14 Jun 2024 09:19:17 +0530 Subject: [PATCH] adi:ad7134: Add support for ad7134 1. Add pyadi driver for ad7134 family 2. Add example script for data capture with AD7134 3. Add documentation changes --- adi/__init__.py | 1 + adi/ad7134.py | 99 +++++++++++++++++++++++++++++++ doc/source/devices/adi.ad7134.rst | 7 +++ doc/source/devices/index.rst | 1 + examples/ad7134_example.py | 47 +++++++++++++++ supported_parts.md | 2 + test/emu/devices/ad7134.xml | 1 + test/emu/hardware_map.yml | 11 +++- test/test_ad7134.py | 12 ++++ 9 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 adi/ad7134.py create mode 100644 doc/source/devices/adi.ad7134.rst create mode 100644 examples/ad7134_example.py create mode 100644 test/emu/devices/ad7134.xml create mode 100644 test/test_ad7134.py diff --git a/adi/__init__.py b/adi/__init__.py index 4050014ed..d2d4ff84f 100644 --- a/adi/__init__.py +++ b/adi/__init__.py @@ -22,6 +22,7 @@ from adi.ad5940 import ad5940 from adi.ad6676 import ad6676 from adi.ad7124 import ad7124 +from adi.ad7134 import ad7134 from adi.ad7291 import ad7291 from adi.ad7606 import ad7606 from adi.ad7689 import ad7689 diff --git a/adi/ad7134.py b/adi/ad7134.py new file mode 100644 index 000000000..1f3b8c2a7 --- /dev/null +++ b/adi/ad7134.py @@ -0,0 +1,99 @@ +# Copyright (C) 2024 Analog Devices, Inc. +# +# SPDX short identifier: ADIBSD + +from decimal import Decimal + +import numpy as np +from adi.attribute import attribute +from adi.context_manager import context_manager +from adi.rx_tx import rx + + +class ad7134(rx, context_manager): + + """ AD7134 ADC """ + + _complex_data = False + channels = [] # type: ignore + _device_name = "" + + def __init__(self, uri="", device_name=""): + """Constructor for AD7134 class.""" + context_manager.__init__(self, uri, self._device_name) + + compatible_parts = ["ad7134", "ad4134"] + + self._ctrl = None + + if not device_name: + device_name = compatible_parts[0] + else: + if device_name not in compatible_parts: + raise Exception(f"Not a compatible device: {device_name}") + + # Select the device matching device_name as working device + self._ctrl = self._ctx.find_device(device_name) + self._rxadc = self._ctx.find_device(device_name) + + if not self._ctrl: + raise Exception(f"Cannot find IIO device {device_name}") + + if not self._rxadc: + raise Exception(f"Cannot find IIO device {device_name}") + + self.channels = [] + for ch in self._ctrl.channels: + name = ch._id + self._rx_channel_names.append(name) + self.channel.append(self._channel(self._ctrl, name)) + + rx.__init__(self) + + class _channel(attribute): + + """ AD7134 channel """ + + def __init__(self, ctrl, channel_name): + self.name = channel_name + self._ctrl = ctrl + + @property + def raw(self): + """AD7134 channel raw value""" + return self._get_iio_attr(self.name, "raw", False) + + @property + def scale(self): + """AD7134 channel scale""" + return float(self._get_iio_attr_str(self.name, "scale", False)) + + @scale.setter + def scale(self, value): + self._set_iio_attr(self.name, "scale", False, str(Decimal(value).real)) + + @property + def offset(self): + """AD7134 channel offset""" + return float(self._get_iio_attr_str(self.name, "offset", False)) + + @offset.setter + def offset(self, value): + self._set_iio_attr(self.name, "offset", False, str(Decimal(value).real)) + + def to_volts(self, index, val): + """Converts raw value to SI""" + _scale = self.channel[index].scale + + ret = None + + if isinstance(val, np.int16): + ret = val * _scale + + if isinstance(val, np.ndarray): + ret = [x * _scale for x in val] + + if ret is None: + raise Exception("Error in converting to actual voltage") + + return ret diff --git a/doc/source/devices/adi.ad7134.rst b/doc/source/devices/adi.ad7134.rst new file mode 100644 index 000000000..a7292a529 --- /dev/null +++ b/doc/source/devices/adi.ad7134.rst @@ -0,0 +1,7 @@ +ad7134 +================= + +.. automodule:: adi.ad7134 + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/source/devices/index.rst b/doc/source/devices/index.rst index 219fc8f8e..b9451ab08 100644 --- a/doc/source/devices/index.rst +++ b/doc/source/devices/index.rst @@ -23,6 +23,7 @@ Supported Devices adi.ad5940 adi.ad6676 adi.ad7124 + adi.ad7134 adi.ad717x adi.ad719x adi.ad7291 diff --git a/examples/ad7134_example.py b/examples/ad7134_example.py new file mode 100644 index 000000000..01adbaa26 --- /dev/null +++ b/examples/ad7134_example.py @@ -0,0 +1,47 @@ +# Copyright (C) 2024 Analog Devices, Inc. +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# - Neither the name of Analog Devices, Inc. nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# - The use of this software may or may not infringe the patent rights +# of one or more patent holders. This license does not release you +# from the requirement that you obtain separate licenses from these +# patent holders to use this software. +# - Use of the software either in source or binary form, must be run +# on or directly connected to an Analog Devices Inc. component. +# +# THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +# INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A +# PARTICULAR PURPOSE ARE DISCLAIMED. +# +# IN NO EVENT SHALL ANALOG DEVICES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, INTELLECTUAL PROPERTY +# RIGHTS, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import adi +import numpy as np + +ad7134_dev = adi.ad7134("ip:analog") + +chn = 0 +ad7134_dev._rx_data_type = np.int32 +ad7134_dev.rx_output_type = "SI" +ad7134_dev.rx_enabled_channels = [chn] +ad7134_dev.rx_buffer_size = 100 + +data = ad7134_dev.rx() + +print(data) diff --git a/supported_parts.md b/supported_parts.md index 26bc0663b..0ddfdb1c2 100644 --- a/supported_parts.md +++ b/supported_parts.md @@ -24,6 +24,7 @@ - AD4114 - AD4115 - AD4116 +- AD4134 - AD4630 - AD4696 - AD4697 @@ -70,6 +71,7 @@ - AD5940 - AD6676 - AD7124 +- AD7134 - AD7172-2 - AD7172-4 - AD7173-8 diff --git a/test/emu/devices/ad7134.xml b/test/emu/devices/ad7134.xml new file mode 100644 index 000000000..8277c04fa --- /dev/null +++ b/test/emu/devices/ad7134.xml @@ -0,0 +1 @@ +]> \ No newline at end of file diff --git a/test/emu/hardware_map.yml b/test/emu/hardware_map.yml index bbb257ff5..a2b0ba1c4 100644 --- a/test/emu/hardware_map.yml +++ b/test/emu/hardware_map.yml @@ -591,4 +591,13 @@ ad405x: - emulate: - filename: ad405x.xml - data_devices: - - iio:device0 \ No newline at end of file + - iio:device0 + +ad7134: + - ad4134 + - emulate: + - filename: ad7134.xml + - data_devices: + - iio:device0 + - pyadi_iio_class_support: + - ad7134 \ No newline at end of file diff --git a/test/test_ad7134.py b/test/test_ad7134.py new file mode 100644 index 000000000..f79f7f747 --- /dev/null +++ b/test/test_ad7134.py @@ -0,0 +1,12 @@ +import pytest + +hardware = "ad7134" +classname = "adi.ad7134" + + +######################################### +@pytest.mark.iio_hardware(hardware, True) +@pytest.mark.parametrize("classname", [(classname)]) +@pytest.mark.parametrize("channel", [0]) +def test_ad7134_rx_data(test_dma_rx, iio_uri, classname, channel): + test_dma_rx(iio_uri, classname, channel)