Updated libs. Some comments and tests on cmake with msys2.

scripts/configure_cmake_msys2.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
-cmake . -G"Ninja" -DLASP_HAS_ULDAQ=OFF -DPython3_ROOT_DIR=C:\Users\User\AppData\Local\Programs\Python\Python310
+cmake . -G"Ninja" -DLASP_HAS_ULDAQ=OFF #-DPython3_ROOT_DIR=C:\\winpython\\python-3.10.9.amd64
-arch=urcr64
+arch=ucrt64
 #arch=mingw64
 
 files_to_cpy="libfftw3-3.dll libgcc_s_seh-1.dll libgfortran-5.dll libgomp-1.dll libopenblas.dll libquadmath-0.dll libstdc++-6.dll libwinpthread-1.dll"

scripts/install_msys2_builddeps.sh

@@ -10,7 +10,7 @@ arch=mingw-w64-ucrt-x86_64
 
 pacman -S ${PACMAN_OPTIONS} make
 
-deps="gcc make toolchain ccache cmake openblas pybind11 fftw"
+deps="gcc ninja ccache cmake openblas fftw"
 for dep in $deps; do
     pacman -S ${PACMAN_OPTIONS} ${arch}-${dep}
 done

src/lasp/device/lasp_rtaudiodaq.cpp

@@ -244,8 +244,8 @@ public:
                        &myerrorcallback);
 
     if (nFramesPerBlock_copy != nFramesPerBlock) {
-      throw rte("Got different number of frames per block back from RtAudio "
+      throw rte(string("Got different number of frames per block back from RtAudio "
-                "backend. I do not know what to do.");
+                "backend: ") + std::to_string(nFramesPerBlock_copy) + ". I do not know what to do.");
     }
   }
 

src/lasp/device/lasp_streammgr.cpp

@@ -333,10 +333,13 @@ void StreamMgr::startStream(const DaqConfiguration &config) {
     d fs = daq->samplerate();
     /// Create input filters
     _inputFilters.clear();
-    /// No input filter for monitor channel.
+	
+    /// No input filter for monitor channel, which comes as the first input channel
+	/// In the list
     if (config.monitorOutput && devinfo->hasInternalOutputMonitor) {
       _inputFilters.push_back(nullptr);
     }
+	
     for (auto &ch : daq->inchannel_config) {
       if (ch.enabled) {
         if (ch.digitalHighPassCutOn < 0) {

test/CMakeLists.txt

@@ -1,8 +1,8 @@
-include_directories(SYSTEM
+include_directories(SYSTEM ../third_party/armadillo-code/include)
-    ${PROJECT_SOURCE_DIR}/third_party/armadillo-code/include)
+#add_executable(test_daq test_daq.cpp)
-add_executable(test_daq test_daq.cpp)
 add_executable(test_smgr test_smgr.cpp)
+
 include_directories(../src/lasp/device ../src/lasp/dsp ../src/lasp)
 include_directories(../third_party/gsl-lite/include)
-target_link_libraries(test_daq lasp_device_lib lasp_dsp_lib)
+#target_link_libraries(test_daq lasp_device_lib lasp_dsp_lib)
 target_link_libraries(test_smgr lasp_device_lib lasp_dsp_lib)

test/test_smgr.cpp

@@ -16,16 +16,16 @@ bool inCallback(const DaqData& d) {
 int main(int argc, const char **const argv) {
 
   StreamMgr& mgr = StreamMgr::getInstance();
-  std::vector<DeviceInfo> devs = mgr.getDeviceInfo();
+  DeviceInfoList devs = mgr.getDeviceInfo();
 
   DeviceInfo *mon_device = nullptr;
   for (auto &d : devs) {
-
+	
-    string name_lower = d.device_name;
+    string name_lower = d->device_name;
     transform(name_lower.begin(), name_lower.end(), name_lower.begin(),
               ::tolower);
     if (name_lower.find("monitor") != string::npos) {
-      mon_device = &d;
+      mon_device = d.get();
     }
   }
 

third_party/DebugTrace-cpp

@@ -1 +1 @@
-Subproject commit 43d5ff136438b6f3461b529b3231d55be77094e0
+Subproject commit 9b143ea40a34d6268d671ea54cd0ba80396b6363

third_party/uldaq

@@ -1 +1 @@
-Subproject commit 1d8404159c0fb6d2665461b80acca5bbef5c610a
+Subproject commit 6e5940eae0d44df49ff64fc7dedd49f86db56cd0