Merge branch 'main' of https://whale.am28.uni-tuebingen.de/git/Awendt/pyrelacs

pyrelacs/app.py

@@ -107,10 +107,25 @@ class PyRelacs(QMainWindow):
         data = 2 * np.sin(2 * np.pi * 10 * time)
 
         buffer = ctypes.c_double * len(time)
+        buffer_ai = uldaq.create_float_buffer(1, len(time))
         data_c = buffer(*data)
         log.debug(f"Created C_double data {data_c}")
 
         ao_device = self.daq_device.get_ao_device()
+        ai_device = self.daq_device.get_ai_device()
+
+        er = ai_device.a_in_scan(
+            1,
+            1,
+            uldaq.AiInputMode.SINGLE_ENDED,
+            uldaq.Range.BIP10VOLTS,
+            int(len(data)),
+            30_000.0,
+            uldaq.ScanOption.EXTTRIGGER,
+            uldaq.AInScanFlag.DEFAULT,
+            data=buffer_ai,
+        )
+        # ai_device.scan_wait(uldaq.WaitType.WAIT_UNTIL_DONE, timeout=-1)
 
         err = ao_device.a_out_scan(
             0,
@@ -122,8 +137,11 @@ class PyRelacs(QMainWindow):
             uldaq.AOutScanFlag.DEFAULT,
             data_c,
         )
-        while ao_device.get_scan_status()[0] == 1:
+        # INFO: Need to wait for the acquistion
-            log.debug("Still running")
+        self.daq_disconnect_button.setDisabled(True)
+        self.daq_connect_button.setEnabled(True)
+        embed()
+        exit()
 
 
 if __name__ == "__main__":

pyrelacs/daq_thread.py

@@ -1,12 +1,6 @@
-import pathlib
+import traceback
-
+import sys
-import tomli
+from PyQt6.QtCore import QRunnable, pyqtSignal, pyqtSlot, QObject
-from PyQt6.QtCore import QRunnable, QThread, pyqtSignal, pyqtSlot, QObject
-import ctypes
-import uldaq
-import numpy as np
-from IPython import embed
-import traceback, sys
 
 from pyrelacs.util.logging import config_logging