ASCEE/lasp
ASCEE/lasp
5
1
Fork 0
Code Issues 5 Pull Requests Actions Releases 14 Activity

Some small changes.

Browse Source
This commit is contained in:
Anne de Jong 2023-06-11 05:33:16 -07:00
parent 0d02779f2e
commit f9640a5f99
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/configure_cmake_msys2.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
cmake . -G"Ninja" -DLASP_HAS_ULDAQ=OFF #-DPython3_ROOT_DIR=C:\\winpython\\python-3.10.9.amd64 cmake . -G"Ninja" -DLASP_HAS_ULDAQ=OFF -DPython3_ROOT_DIR=C:\\winpython\\python-3.10.9.amd64
arch=ucrt64 arch=ucrt64
#arch=mingw64 #arch=mingw64

2
setup.py
View File

@ -9,7 +9,7 @@ if 'Linux' in pf:
# Split of path from file. # Split of path from file.
extensions = list(glob.glob('src/lasp/' + ext_name_glob)) extensions = list(glob.glob('src/lasp/' + ext_name_glob))
elif 'Windows' in pf: elif 'Windows' in pf:
ext_name_glob = 'lasp_cpp.cp*.pyd' ext_name_glob = 'lasp_cpp*.cp*.pyd'
# Split of path from file. # Split of path from file.
extensions = list(glob.glob('src\\lasp/' + ext_name_glob)) extensions = list(glob.glob('src\\lasp/' + ext_name_glob))
else: else:

2
src/lasp/device/lasp_streammgr.cpp
View File

@ -60,8 +60,8 @@ void StreamMgr::checkRightThread() const {
void StreamMgr::rescanDAQDevices(bool background, void StreamMgr::rescanDAQDevices(bool background,
std::function<void()> callback) { std::function<void()> callback) {
DEBUGTRACE_ENTER; DEBUGTRACE_ENTER;
DEBUGTRACE_PRINT(background);
auto &pool = getPool(); auto &pool = getPool();
checkRightThread(); checkRightThread();
if (!_devices_mtx.try_lock()) { if (!_devices_mtx.try_lock()) {
throw rte("A background DAQ device scan is probably already running"); throw rte("A background DAQ device scan is probably already running");