Commit Graph

351 Commits

Author SHA1 Message Date
476d989898 Bugfix in Measurement, updated such that DaqChannel Qty can no longer be set in constructor 2020-11-19 11:12:07 +01:00
dd0b011fa3 Disabled annotation. Improved compilation flag for Cython 2020-11-19 11:11:38 +01:00
e137ea9b9f Merged DT9837A branch 2020-11-08 00:23:38 +01:00
0e1bbec1d1 More bugfixes. Starts to go in the right direction :) 2020-11-08 00:17:59 +01:00
312d7fa694 Bugfix, wrong queue sent 2020-11-07 21:58:03 +01:00
f301e3d5f9 Bugfix in RtAudio. Almost working properly 2020-11-07 21:36:05 +01:00
3d188281ab Fixed latest bugs. Now everything seems to be working, at least with the RtAudio API 2020-11-07 16:33:49 +01:00
4e0c09d356 Almost working on multiple apis 2020-11-05 17:13:09 +01:00
c1f713c8fb Inbetween state. GUI crashes on channelConfig.set() 2020-10-31 20:51:35 +01:00
013bc479c7 Small bugfix in SLM 2020-10-19 16:58:09 +02:00
7e3c117ce1 Set default FFT lib to FFTW 2020-10-18 14:09:51 +02:00
fa32e9eac3 Bugfixes of Python/C++ interaction layer, first tests for DaqConfiguration code 2020-10-18 13:58:42 +02:00
6b8abb878a RtAudio in a theoretically working state. Now its time for some testing. 2020-10-17 19:14:24 +02:00
622dd1f319 Added possibility to get index of qty 2020-10-16 21:12:31 +02:00
cf4156060e Cleanup: files that should not be there 2020-10-16 21:11:51 +02:00
a16fa576fd Merged DT9837A 2020-10-16 21:07:58 +02:00
f54ac216c1 Major cleanup of compilation warnings. 2020-10-16 20:37:02 +02:00
9f96858de1 Let SLM work without filterbank. 2020-10-16 18:33:22 +02:00
bc9639f10c Inbetween state. Nothing is working 2020-10-14 09:42:19 +02:00
29662c82e3 Working C++ multiple API sit 2020-10-10 18:28:43 +02:00
a43857070b DaqConfiguration and device info will have a direct Cython wrapper 2020-10-07 21:10:19 +02:00
a3963c4595 Working in CPP code, with multiple-api-api 2020-10-06 21:29:02 +02:00
2e83942771 Accidentally added binary file to git 2020-10-06 20:38:46 +02:00
fda78a6f2c Bugfix referrring nframesperblock before assignment 2020-10-06 13:25:01 +02:00
a73ef3d7a8 First work on moving RtAudio Api back to C++. 2020-10-04 22:29:54 +02:00
5c6838c7e4 Accidentally added binary to git 2020-10-02 10:02:24 +02:00
2775e29fab Updated some definitions 2020-10-02 10:01:18 +02:00
c8bfc461ce Final bugfix, of memory leak in Python thread for uldaq, proper sleep time in Python thread. The whole train with UlDaq now seems to work properly 2020-09-27 19:38:49 +02:00
21e1b9d811 Added testing program, cleaned up the Python thread 2020-09-24 19:43:52 +02:00
108e023026 Moved whole threading code with UlDaq to C++ 2020-09-22 19:32:00 +02:00
248fa8d8a4 Merge branch 'develop' into DT9837A 2020-09-18 08:55:43 +02:00
0232b8aae0 We have some problems with the Measurement class. One way or another, changes to measurement files (sensitivity values) from ACME are not stored in the measurement file. Moreover, we concluded that the Measurement interface contains some inconsistencies/unclarities in its interface 2020-09-18 08:55:24 +02:00
fa0c241fb9 Daq measurement interface changed to permanently work with UlDaq. Should become a choice in future. Simultaneous output and input not yet working. Probably the DAQ API is not working properly with threads. We should find a minimum working example of simultaneous input/output. Then, the UlDAQ and RtAudio details should be abstracted away in a common interface, written in C++ 2020-09-18 08:52:56 +02:00
1f9279ff86 Working RtAudio backend. Small change. Now ready for hard change to UlDaq backend 2020-09-16 09:40:00 +02:00
c9b84e4c96 First work to multiple API AvStreams. Python thread for UlDaq does compile, ready for testing 2020-09-15 20:34:27 +02:00
49ee42bb01 WORKING in and outputgit status 2020-09-15 14:16:48 +02:00
a3a7c37548 First work on uldaq implementatio for DT9837A 2020-09-12 23:34:28 +02:00
2192f5a7fc Parallelized the SOS filter implementation. Updated worker implementation to deal with NULL pointers for initialization and destructor function pointers 2020-08-29 20:11:09 +02:00
28358f5385 Added calibration settings 2020-08-22 19:53:39 +02:00
0b5a94be4c Input of filterbank API improvements 2020-08-22 11:00:55 +02:00
4dd95cb80c Level ref value can be changed in SLM, Qty stuff stored in measurement 2020-08-22 11:00:08 +02:00
0a8949e0cf Updated exporting to wav file, NEEDS more testing. Added progress function to signal generator, which returns None by default 2020-08-20 10:23:24 +02:00
683c0b6566 Removed assertions on n_rows and n_cols in lasp_pyarray.h 2020-08-08 14:07:32 +02:00
c9ad4dc1b4 Bugfix for transposing an numpy array in code. Can only be done by calling PyArray_Transpose, not by setting flags, apparently. Fixed the lasp_recording for new member attributes of AvStream. 2020-08-05 09:56:58 +02:00
287b0cfe83 Big change to new stream configuration. Possibility to include output channels back to input 2020-08-03 20:17:52 +02:00
b17178c4a7 Better implementation of 'Measurement.fromWaveFile, using scipy, which is able to handle wave files with floating point data 2020-07-23 16:12:54 +02:00
3e2e8c8953 Merge branch 'develop' into channel_metadata 2020-07-09 09:47:48 +02:00
6830d5192e Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into develop 2020-07-09 09:45:14 +02:00
c30960b1a3 Added method to import measurement data from a wave file 2020-07-09 09:45:08 +02:00
8fafac2050 First work on getting units in metadata 2020-05-28 21:26:30 +02:00