Commit Graph

443 Commits

Author SHA1 Message Date
Anne de Jong 0c0a86dc64 Update RtAudio backend to overwrite default samplerate to 48 kHz, if available 2022-11-11 12:35:52 +01:00
Casper Jansen fbb14f475c Added offset_t option to SLM(); removed trailing spaces 2022-11-10 11:39:44 +01:00
Casper Jansen e405ab8eea Bugfix in lasp_measurement.py/CPS() 2022-11-08 14:27:16 +01:00
Casper Jansen 6517fb0029 Bugfix: Sweep reaches from fl to fu within actual sweep time instead of [sweep time + quiescent time] 2022-10-27 15:00:17 +02:00
Thijs Hekman 441685ad32 Bugfix for non contiguous channels are enabled on UlDAQ 2022-10-25 16:45:48 +02:00
Anne de Jong bf854b4055 Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into develop 2022-10-24 13:32:03 +02:00
Anne de Jong 48de9cc3cb BUGfix: only add filters for enabled input channels 2022-10-24 13:31:57 +02:00
Casper Jansen b259580736 Add: DaqConfigurations.loadRaw() and saveRaw() for easy accessing of DAQ configuration data 2022-10-24 12:05:59 +02:00
Anne de Jong 6eaf5db691 Added possibility to get the periodic sequence to Python using the getSequence() method on class Periodic. Added a check that at least one of LogSweep or LinSweep should be activated. 2022-10-21 23:12:47 +02:00
Anne de Jong 30992add71 Physical output quantity added in device info 2022-10-21 22:30:06 +02:00
Anne de Jong e3e8d75e0c Removed not necessary boost dependency 2022-10-21 18:19:37 +02:00
Anne de Jong bcf30044e6 (Re)implemented digital highpass filter on input data. 2022-10-20 17:12:34 +02:00
Anne de Jong cb72c2ba74 Added first order high pass static method 2022-10-20 16:31:55 +02:00
Anne de Jong fae1847cf8 Belongs to previous commit 2022-10-20 12:29:24 +02:00
Anne de Jong 6758655eaa Bugfix in changing measurement channelConfig afterwards. Was not correctly fixed, as to store the enum index corresponding to the quantity 2022-10-20 12:28:46 +02:00
Anne de Jong 142a161283 Improved stream handling code in stream manager. No pointers to pointers anymore. 2022-10-19 11:57:51 +02:00
Thijs Hekman 6bd03301aa Bugfix: duplex stream came on output 2022-10-19 10:03:13 +02:00
Anne de Jong e274e12f82 Added ARMA_NO_DEBUG flag for release mode 2022-10-18 22:31:25 +02:00
Anne de Jong d0854ae84b Changed explicit nullptr to more C++-like reset() 2022-10-18 22:24:53 +02:00
Anne de Jong 8429dfa4e8 Added comment. Made sure reset() of indatahandlers is called prior to starting stream. Other order could result in bugs 2022-10-17 19:51:10 +02:00
Anne de Jong b29f004f23 Made PPM meter range-aware. Improved PPM-code. Made RtAps sensitivity-aware. Improved code to get ranges for each channel from Daq object 2022-10-17 19:37:31 +02:00
Anne de Jong 4233e66d27 Bugfix: accidentally forgot to commit two statementes in threadedindatahandler.cpp 2022-10-16 21:30:17 +02:00
Anne de Jong bebd270b44 Bugfix: reset() was called after inCallback() when adding new handler to StreamMgr. Bugfix: start() was doubly called for RtAPS. Once from Python and once from C++ in constructor. Renamed some scoped_lock to Lck. Added some comments 2022-10-16 21:26:06 +02:00
Anne de Jong e2aa149030 Merge branch 'master' into develop 2022-10-16 18:39:55 +02:00
Anne de Jong 76dbdfb526 Working equalizer 2022-10-16 18:39:13 +02:00
Casper Jansen a73863d044 Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into develop 2022-10-13 12:07:05 +02:00
Casper Jansen 4db90e3885 Bugfix: exportAsWave() normalization failed when dtypes of data and maxabs were different 2022-10-13 12:06:51 +02:00
Anne de Jong 47a2e9972c Added filter map to siggen. Debugged biquadbank to properly work. 2022-10-12 21:32:24 +02:00
Anne de Jong 20be897a17 Filters back installed in RtAps 2022-10-12 15:23:12 +02:00
Anne de Jong ec689621b5 Added Armadillo backend for Fft's. This one seems to work properly. Added some tests code for daq and StreamMgr in C++. Fixed a stray of a debug dmat somewhere in lasp_daqdata. 2022-10-12 15:02:42 +02:00
Anne de Jong 0d6d72fb35 Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into develop 2022-10-11 14:50:49 +02:00
Anne de Jong 4764a52de8 Improved code for cubes. RtAps is not working. Don't know why. TimeBuffer code has better readability. Bugfix in output from Column to Numpy. GIL release for AvPowerSpectra::compute via Pybind. 2022-10-11 14:50:44 +02:00
Thijs Hekman 6ed88af3e2 Fixed assert in octave filter 2022-10-11 10:50:45 +02:00
Anne de Jong 6aa1262c73 BUG: Added SeriesBiquad Pybind11 constructor 2022-10-11 10:43:31 +02:00
Anne de Jong 6c614d7e6c Added check, that for duplex mode both in- and output channels should be enabled 2022-10-11 10:05:28 +02:00
Anne de Jong 84a0d11d43 Removed one more debugtrace in lasp_slm.cpp 2022-10-11 10:00:02 +02:00
Anne de Jong 58ed65487b Removed Boost, removed DEBUGTRACE 2022-10-11 09:55:08 +02:00
Anne de Jong 62d63c332b Removed Boost dependency 2022-10-11 09:53:50 +02:00
Anne de Jong c05ae4d6f4 Removed carma Armadillo converters as dependency 2022-10-11 09:51:21 +02:00
Anne de Jong c3dabfc853 Added manual Armadillo - Numpy converters 2022-10-11 09:50:15 +02:00
Anne de Jong 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
Anne de Jong ce402acd15 Fixed bug of left mutex in RtAudio backend 2022-10-10 19:29:51 +02:00
Anne de Jong ebe385b9db Cleaned up example code 2022-10-10 19:29:24 +02:00
Anne de Jong 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
Thijs Hekman e7f80ce741 Could not find Python on Requiem. Added include_directories. Fixed bug of old Armadillo place 2022-10-07 09:34:32 +02:00
Anne de Jong 2363c11450 Fixed a deadlock and set one debugtrace to disabled in siggen_impl. 2022-10-06 21:48:57 +02:00
Anne de Jong a581226f3d Merged Pybind11 branch. It is more ~ less ready 2022-10-06 21:45:36 +02:00
Anne de Jong 90a5d87419 Typo fix. Added 44.1 kHz as possible sampling frequency for computing filters. 2022-10-06 21:34:33 +02:00
Anne de Jong 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
Anne de Jong 01674db1e8 Added setFilter possibility for Siggen, and removed one default debugtrace enabled 2022-10-05 21:51:47 +02:00