Commit Graph

358 Commits

Author SHA1 Message Date
84a0d11d43 Removed one more debugtrace in lasp_slm.cpp 2022-10-11 10:00:02 +02:00
58ed65487b Removed Boost, removed DEBUGTRACE 2022-10-11 09:55:08 +02:00
62d63c332b Removed Boost dependency 2022-10-11 09:53:50 +02:00
c05ae4d6f4 Removed carma Armadillo converters as dependency 2022-10-11 09:51:21 +02:00
c3dabfc853 Added manual Armadillo - Numpy converters 2022-10-11 09:50:15 +02:00
e4ab05d36a Removed carma usage. This bugs as it changes the default allocator for armadillo, which does not work properly when native C++ threads do not register themselves as a thread for Python. We implemented the required convertors between Python and Armadillo ourselves. This also fixes the problem of Carma not being officially Python3.10 proof. 2022-10-11 09:43:36 +02:00
ce402acd15 Fixed bug of left mutex in RtAudio backend 2022-10-10 19:29:51 +02:00
ebe385b9db Cleaned up example code 2022-10-10 19:29:24 +02:00
fae906884e Textual improvements. Formatting (Neoformat) improvements. Let DataTypeDescriptor be a reference (to a global const std map in Daq class. Improved naming of certain functions. Better DaqData implementation, now we make sure memory alignment is good at all times. Switched functions arguments in DaqData constructor to comply with all other cases of first frame, then channel. Better naming of stream in RtAudio. Better handling of faulty function calling in RtAudio start(). Bugfix in RtAudio, did call right Daq::dtypeDescr() function --> result was that only first channel was copied to all channels. Added extra check in StreamMgr. Removed unnecessary TypedDaqData class. Use a safe queue in threaded in data handler. We can now remove the Boost code for that. 2022-10-10 19:17:38 +02:00
e7f80ce741 Could not find Python on Requiem. Added include_directories. Fixed bug of old Armadillo place 2022-10-07 09:34:32 +02:00
2363c11450 Fixed a deadlock and set one debugtrace to disabled in siggen_impl. 2022-10-06 21:48:57 +02:00
a581226f3d Merged Pybind11 branch. It is more ~ less ready 2022-10-06 21:45:36 +02:00
90a5d87419 Typo fix. Added 44.1 kHz as possible sampling frequency for computing filters. 2022-10-06 21:34:33 +02:00
f7a49dc4ff Added real time spectra: RtAps. All seem to work. Bugfix with SiQtys storage. Added extra lock guards for constructor and destructors of InDataHandlers (otherwise race conditions occur). Changed time_constant integer to fs_tau in AvPowerSpectra. 2022-10-06 21:13:21 +02:00
01674db1e8 Added setFilter possibility for Siggen, and removed one default debugtrace enabled 2022-10-05 21:51:47 +02:00
4b82977709 Set some DEBUGTRACES back to disabled by default 2022-10-05 19:23:00 +02:00
9324c9bc54 Added small debugtrace 2022-10-05 14:58:38 +02:00
3481e4f9ba Bugfix for OpenMP combinded with FFT. That one could not run in parallel in its current form. 2022-10-05 14:57:39 +02:00
12d6826140 Removed some compile warnings when compiling sub-projects. Removed warnings related to unknown pragmas in case of compiling without OpenMP support. Fixed some test problems 2022-10-05 13:39:45 +02:00
31ead60469 Added RtAudio and UlDAQ as subprojects that are compiled in. Fixed proper connection of UlDAQ. Set default sensitity to 1.0 for a new DaqChannel. Segfault bug fixed in DaqData::copyToRaw. Scan in background for devices when StreamMgr() is initialized. Fixed bug in storing of DaqConfigs to lasp_shelve. Set RtAudio to 5.2.0. 2022-10-05 11:27:46 +02:00
e900a5ddad Updated PPM to give clip indices length same as number of channels. Grouped the real time components to group dsp/rt. 2022-10-04 09:48:32 +02:00
5f1a207104 Added Peak Programme Meter, added functionality to clone SeriesBiquads without copying state. Improved recording callback mechanism. Added reset() function for IndataHandlers, which send a pointer to DAQ instance. 2022-10-04 09:27:27 +02:00
bb26fc6bcc Added suggested SLM down sampling factor, improved quite a lot of documentation. Measurement object can now work with old, as well as new measurement files. 2022-10-01 19:59:35 +02:00
59085b091f Some bugfixes and useful function additions 2022-09-28 09:41:02 +02:00
288e7c8dc5 Input stream and output stream both running. Added lockfree boost dependency to git modules, removed carma build as it is not required and every time again downloads Armadillo. Added functions to enable / disable all channels at once. Fixed a bug with RtAudio input streams. Fixed a bug in StreamMgr leading to segfaults (how to: use std::move ;)). 2022-09-27 17:20:45 +02:00
5ce5fba50b Sweep bug fixed. There is still something weird with RtAudio: only one channel is outputting signal. 2022-09-22 21:02:41 +02:00
b200b465f6 Code cleanup. RescanDaqdevices changed API. DaqApi string returns only apiname. Added comments, added Doxygen groups, exported FFT wisdom load / store to Python. SLM stores reference level squared. Added comments on SLM Lpeak, Leq and Lmax, a lot of using rte = std::runtime_error, added Window string conversion, Pybind11 enum no longer exports values, added cpp_enum to convert Qty to an enumerated value in C++ code. Removed class and methods to fill comboboxes. Does not belong in LASP, but in ACME instead. DeviceInfo has operator string(). 2022-09-22 10:18:38 +02:00
b629edde4c Updated pyproject and doxyfile, and readme 2022-09-22 10:11:47 +02:00
70891ceaf4 Switched to OpenMP for parallellizing for loops. Bugfixes in PowerSpectra() class. Added tests to check Parsevall hold. Improved lots of comments. Added module groups. Use CMake to specify code version number. Device info should be obtained from StreamMgr in Python code. 2022-09-03 20:59:14 +02:00
10749137ec Removed old C-code. This is not the way forward anymore 2022-09-03 16:10:12 +02:00
34239bfabf Removed old testing code. Improved Doxyfile, added logo to Doxygen. Added pytest testing config. 2022-09-03 16:07:44 +02:00
f8e8ab422b SLM seems to be working. Needs proper testing. Not yet fully coupled to Python code 2022-08-16 21:22:35 +02:00
c75f0dddc5 Split up indatahandler with python callback in part and part that calls the Python function. Threading is now handled using a thread pool. Some bugfixes 2022-08-14 21:00:22 +02:00
1e8b18aabe Added threadpool, biquadbank could be working for equalizer. First steps of SLM and AvPowerSpectra 2022-08-11 14:47:44 +02:00
7ca52695da First work on avpowerspectra implementation. Added stubs for all other code that needs to be implemented in C++ as well. 2022-08-07 21:13:45 +02:00
12cf9586eb DaqConfiguration(s) back in place. Time to couple some stuff to ACME 2022-08-01 17:26:22 +02:00
0421236ed0 Renamded lasp_daqconfiguration.cpp to lasp_daqconfig.cpp in pybind11 2022-07-29 09:36:49 +02:00
3160aacc07 Replaced github STL-Threadsafe with boost::lockfree. Added PyIndataHandle to glue Python callbacks to new data. First work on getting recording back to work. 2022-07-29 09:32:26 +02:00
b35686f79d Default build type is Release 2022-07-25 22:30:11 +02:00
da99618fc3 Some comment improvement and cleanup 2022-07-25 22:29:42 +02:00
6a006e27f9 Output of a sine wave now works. Pfff 2022-07-20 14:58:48 +02:00
7095f9d5e7 Intermediate commit. Ready for some serious testing. 2022-06-29 12:25:32 +02:00
b561c83448 Deleted last Cython stray 2022-06-14 21:54:13 +02:00
3b3bd6d83d Backend ready for some testing 2022-06-13 21:30:02 +02:00
7eaaf43653 Inbetween pybind11 commit. Nothing working. 2022-06-13 19:35:41 +02:00
c9580b2c28 Updated code to only ask for input stream when starting recording 2022-06-07 15:01:53 +02:00
89a29c6d41 Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into develop 2022-06-07 11:08:17 +02:00
5d1b88a883 Merge branch 'stable' into develop 2022-05-25 10:38:59 +02:00
f635cac209 First work on going to Pybind11. Rewritten the code for the UlDaq significantly. Much cleaner, but still contains bugs. 2022-05-23 17:26:29 +02:00
9e03f5e944 Merge branch 'stable' into develop 2022-05-17 15:07:34 +02:00