removing import

pyrelacs/app.py

@@ -19,7 +19,6 @@ from IPython import embed
 import numpy as np
 
 from pyrelacs.util.logging import config_logging
-from pyrelacs.daq_thread import Worker
 
 log = config_logging()
 

pyrelacs/daq_thread.py

@@ -1,78 +0,0 @@
-import traceback
-import sys
-from PyQt6.QtCore import QRunnable, pyqtSignal, pyqtSlot, QObject
-
-from pyrelacs.util.logging import config_logging
-
-log = config_logging()
-
-
-class WorkerSignals(QObject):
-    """
-    Defines the signals available from a running worker thread.
-
-    Supported signals are:
-
-    finished
-        No data
-
-    error
-        tuple (exctype, value, traceback.format_exc() )
-
-    result
-        object data returned from processing, anything
-
-    progress
-        int indicating % progress
-
-    """
-
-    finished = pyqtSignal()
-    error = pyqtSignal(tuple)
-    result = pyqtSignal(object)
-    progress = pyqtSignal(int)
-
-
-class Worker(QRunnable):
-    """
-    Worker thread
-
-    Inherits from QRunnable to handler worker thread setup, signals and wrap-up.
-
-    :param callback: The function callback to run on this worker thread. Supplied args and
-                     kwargs will be passed through to the runner.
-    :type callback: function
-    :param args: Arguments to pass to the callback function
-    :param kwargs: Keywords to pass to the callback function
-
-    """
-
-    def __init__(self, fn, *args, **kwargs):
-        super(Worker, self).__init__()
-
-        # Store constructor arguments (re-used for processing)
-        self.fn = fn
-        self.args = args
-        self.kwargs = kwargs
-        self.signals = WorkerSignals()
-
-        # Add the callback to our kwargs
-        self.kwargs["progress_callback"] = self.signals.progress
-
-    @pyqtSlot()
-    def run(self):
-        """
-        Initialise the runner function with passed args, kwargs.
-        """
-
-        # Retrieve args/kwargs here; and fire processing using them
-        try:
-            result = self.fn(*self.args, **self.kwargs)
-        except:
-            traceback.print_exc()
-            exctype, value = sys.exc_info()[:2]
-            self.signals.error.emit((exctype, value, traceback.format_exc()))
-        else:
-            self.signals.result.emit(result)  # Return the result of the processing
-        finally:
-            self.signals.finished.emit()  # Done

pyrelacs/repro.toml

@@ -1,6 +0,0 @@
-[Sinus]
-duration = 10
-fs = 30000.0
-amplitude = 1
-freq = 10
-

pyrelacs/repros/calbi.py

@@ -0,0 +1,42 @@
+import ctypes
+
+import uldaq
+from IPython import embed
+from pyrelacs.repros.repos import Repos
+from pyrelacs.util.logging import config_logging
+import numpy as np
+import matplotlib.pyplot as plt
+
+log = config_logging()
+
+
+class Calibration(Repos):
+    def __init__(self) -> None:
+        super().__init__()
+
+    def run_calibration(self):
+        # Stimulus
+        time = np.arange(0, DURATION, 1 / SAMPLERATE)
+        data = AMPLITUDE * np.sin(2 * np.pi * SINFREQ * time)
+        # sending stimulus
+        stim, ao_device = self.send_analog_dac(
+            data, [0, 0], SAMPLERATE, ScanOption=uldaq.ScanOption.EXTTRIGGER
+        )
+        read_data = self.read_analog_daq(
+            [0, 1], DURATION, SAMPLERATE, ScanOption=uldaq.ScanOption.EXTTRIGGER
+        )
+        self.digital_trigger()
+        ao_device.scan_wait(uldaq.WaitType.WAIT_UNTIL_DONE, 11)
+        self.digital_trigger(data=0)
+        self.disconnect_dac()
+        embed()
+        exit()
+
+
+if __name__ == "__main__":
+    SAMPLERATE = 40_000.0
+    DURATION = 5
+    AMPLITUDE = 3
+    SINFREQ = 1
+    daq_input = Calibration()
+    daq_input.run_calibration()

pyrelacs/repros/input.py

@@ -1,54 +1,28 @@
-from typing import Optional
-
 import uldaq
-from IPython import embed
-import typer
-from typing_extensions import Annotated
 import matplotlib.pyplot as plt
 
 from pyrelacs.util.logging import config_logging
+from .repos import Repos
 
 log = config_logging()
 
 
-class ReadData:
+class ReadData(Repos):
     def __init__(self) -> None:
-        devices = uldaq.get_daq_device_inventory(uldaq.InterfaceType.USB)
-        log.debug(f"Found daq devices {len(devices)}, connecting to the first one")
-        self.daq_device = uldaq.DaqDevice(devices[0])
-        self.daq_device.connect()
-        log.debug("Connected")
+        super().__init__()
 
-    def read_analog_in(self, channel: Annotated[Optional[int], typer.Argument()] = 0):
+    def analog_in(self) -> None:
         # Get the Ananlog In device and Analog Info
-        ai_device = self.daq_device.get_ai_device()
-        ai_info = ai_device.get_info()
-        log.debug(
-            f"Analog info,\n Channels available {ai_info.get_num_chans()}, \n Max Samplerate: {ai_info.get_max_scan_rate()}"
-        )
-        buffer_len = 1_000_000
-        buf = uldaq.create_float_buffer(1, buffer_len)
-
-        er = ai_device.a_in_scan(
-            1,
-            1,
-            uldaq.AiInputMode.SINGLE_ENDED,
-            uldaq.Range.BIP10VOLTS,
-            buffer_len,
-            500_000,
-            uldaq.ScanOption.DEFAULTIO,
-            uldaq.AInScanFlag.DEFAULT,
-            data=buf,
+        data = self.read_analog_daq(
+            [0, 0],
+            10,
+            3000.0,
         )
-        ai_device.scan_wait(uldaq.WaitType.WAIT_UNTIL_DONE, timeout=-1)
-        log.debug("Scanning")
-
-        self.daq_device.disconnect()
-        self.daq_device.release()
-        plt.plot(buf)
+        plt.plot(data)
         plt.show()
+        self.disconnect_dac()
 
 
 if __name__ == "__main__":
     daq_input = ReadData()
-    typer.run(daq_input.read_analog_in)
+    daq_input.analog_in()

pyrelacs/repros/output.py

@@ -2,6 +2,7 @@ import ctypes
 
 import uldaq
 from IPython import embed
+from pyrelacs.repros.repos import Repos
 from pyrelacs.util.logging import config_logging
 import numpy as np
 import matplotlib.pyplot as plt
@@ -9,40 +10,23 @@ import matplotlib.pyplot as plt
 log = config_logging()
 
 
-class Output_daq:
+class Output_daq(Repos):
     def __init__(self) -> None:
-        devices = uldaq.get_daq_device_inventory(uldaq.InterfaceType.USB)
-        self.daq_device = uldaq.DaqDevice(devices[0])
-        self.daq_device.connect()
+        super().__init__()
+        # devices = uldaq.get_daq_device_inventory(uldaq.InterfaceType.USB)
+        # self.daq_device = uldaq.DaqDevice(devices[0])
+        # self.daq_device.connect()
 
     def write_daq(self):
         log.debug("running repro")
         time = np.arange(0, 10, 1 / 30_000.0)
-        data = 2 * np.sin(2 * np.pi * 10 * time)
-
-        buffer = ctypes.c_double * len(time)
-        data_c = buffer(*data)
-
-        log.debug(f"Created C_double data {data_c}")
-        ao_device = self.daq_device.get_ao_device()
-        ao_info = ao_device.get_info()
-
-        log.debug(
-            f"Analog info,\n Channels available {ao_info.get_num_chans()}, \n Max Samplerate: {ao_info.get_max_scan_rate()}"
-        )
-
-        err = ao_device.a_out_scan(
-            0,
-            0,
-            uldaq.Range.BIP10VOLTS,
-            int(len(data)),
-            30_000.0,
-            uldaq.ScanOption.DEFAULTIO,
-            uldaq.AOutScanFlag.DEFAULT,
-            data_c,
+        data = 2 * np.sin(2 * np.pi * 1 * time)
+        self.send_analog_dac(
+            data, [0, 0], 30_000, ScanOption=uldaq.ScanOption.EXTTRIGGER
         )
-        ao_device.scan_wait(uldaq.WaitType.WAIT_UNTIL_DONE, 11)
 
+    def trigger(self):
+        self.digital_trigger(1)
         self.daq_device.disconnect()
         self.daq_device.release()
 
@@ -50,3 +34,4 @@ class Output_daq:
 if __name__ == "__main__":
     daq_input = Output_daq()
     daq_input.write_daq()
+    # daq_input.trigger()

pyrelacs/repros/repos.py

@@ -1,5 +1,9 @@
-import uldaq
+from ctypes import Array, c_double
+from typing import Union
 from IPython import embed
+import numpy.typing as npt
+import uldaq
+import numpy as np
 
 from pyrelacs.util.logging import config_logging
 
@@ -8,6 +12,124 @@ log = config_logging()
 
 class Repos:
     def __init__(self) -> None:
+        devices = uldaq.get_daq_device_inventory(uldaq.InterfaceType.USB)
+        log.debug(f"Found daq devices {len(devices)}, connecting to the first one")
+        if len(devices) == 0:
+            log.error("Did not found daq devices, please connect one")
+            exit(1)
+        self.daq_device = uldaq.DaqDevice(devices[0])
+        self.daq_device.connect()
+        log.debug("Connected")
+
+    def read_analog_daq(
+        self,
+        channels: list[int],
+        duration: int,
+        samplerate: float,
+        AiInputMode: uldaq.AiInputMode = uldaq.AiInputMode.SINGLE_ENDED,
+        Range: uldaq.Range = uldaq.Range.BIP10VOLTS,
+        ScanOption: uldaq.ScanOption = uldaq.ScanOption.DEFAULTIO,
+        AInScanFlag: uldaq.AInScanFlag = uldaq.AInScanFlag.DEFAULT,
+    ) -> Array[c_double]:
+        if channels[0] == channels[1]:
+            channel_len = 1
+        else:
+            channel_len = len(channels)
+        assert len(channels) == 2, log.error("Please provide a list with two ints")
+
+        ai_device = self.daq_device.get_ai_device()
+        buffer_len = np.shape(np.arange(0, duration, 1 / samplerate))[0]
+        data_analog_input = uldaq.create_float_buffer(channel_len, buffer_len)
+
+        er = ai_device.a_in_scan(
+            channels[0],
+            channels[1],
+            AiInputMode,
+            Range,
+            buffer_len,
+            samplerate,
+            ScanOption,
+            AInScanFlag,
+            data=data_analog_input,
+        )
+        # ai_device.scan_wait(uldaq.WaitType.WAIT_UNTIL_DONE, timeout=-1)
+
+        return data_analog_input
+
+    def send_analog_dac(
+        self,
+        data: Union[list, npt.NDArray],
+        channels: list[int],
+        samplerate: float,
+        Range: uldaq.Range = uldaq.Range.BIP10VOLTS,
+        ScanOption: uldaq.ScanOption = uldaq.ScanOption.DEFAULTIO,
+        AOutScanFlag: uldaq.AOutScanFlag = uldaq.AOutScanFlag.DEFAULT,
+    ):
+        """
+
+        Parameters
+        ----------
+        data : Union[list, npt.NDArray]
+
+        channels : list[int]
+
+        duration : int
+
+        samplerate : float
+
+        AiInputMode : uldaq.AiInputMode
+
+        Range : uldaq.Range
+
+        ScanOption : uldaq.ScanOption
+
+        AInScanFlag : uldaq.AOutScanFlag
+
+
+        Returns
+        -------
+        Array[c_double]
+        ao_device
+
+
+        """
+        buffer = c_double * len(data)
+        data_analog_output = buffer(*data)
+
+        log.debug(f"Created C_double data {data_analog_output}")
+        ao_device = self.daq_device.get_ao_device()
+        ao_info = ao_device.get_info()
+
+        err = ao_device.a_out_scan(
+            channels[0],
+            channels[1],
+            Range,
+            int(len(data)),
+            samplerate,
+            ScanOption,
+            AOutScanFlag,
+            data_analog_output,
+        )
+        log.info(f"The actual scan rate was {err}")
+        # ao_device.scan_wait(uldaq.WaitType.WAIT_UNTIL_DONE, 11)
+
+        return data_analog_output, ao_device
+
+    def digital_trigger(self, portn: int = 0, data: int = 1) -> None:
+        log.info(f"{self.daq_device}")
+        dio_device = self.daq_device.get_dio_device()
+
+        dio_device.d_config_bit(
+            uldaq.DigitalPortType.AUXPORT, portn, uldaq.DigitalDirection.OUTPUT
+        )
+
+        dio_device.d_bit_out(uldaq.DigitalPortType.AUXPORT, bit_number=portn, data=data)
+
+    def disconnect_dac(self):
+        self.daq_device.disconnect()
+        self.daq_device.release()
+
+    def clean_up():
         pass
 
     def run_repo(self) -> None:
@@ -18,9 +140,3 @@ class Repos:
 
     def reload_repo(self) -> None:
         pass
-
-    def read_daq(self) -> None:
-        pass
-
-    def write_daq(self) -> None:
-        pass