Commit Graph

598 Commits

Author SHA1 Message Date
f160b696fb Merge branch 'windows_ready' of ssh://code.ascee.nl:12001/ASCEE/lasp into windows_ready 2023-06-15 10:42:18 -07:00
6353282e24 Merge branch 'develop' into windows_ready
Some checks failed
continuous-integration/drone/push Build is failing
2023-06-15 10:00:40 +02:00
d9a3cfd627 Made default preset for compiled in DAQ backends in CMakeLists
Some checks failed
continuous-integration/drone/push Build is failing
2023-06-15 09:57:06 +02:00
64a268e277 Portaudio backend seems to be working. No extensive checks performed yet. 2023-06-15 09:48:45 +02:00
77b1848bb4 Made functions without correct return type compile time error 2023-06-14 21:24:29 +02:00
88624764e7 Rudymentary portaudio support. A stream callback is running. 2023-06-14 21:23:53 +02:00
303e15e2d6 Renamed ThreadSafeThreadPool to GlobalThreadPool. As of https://github.com/bshoshany/thread-pool/issues/112, the thread pool itself is thread-safe, so we removed the (extra, unnecessary) mutexes around it.
Some checks failed
continuous-integration/drone/push Build is failing
2023-06-12 09:11:08 +02:00
e61d71b08a Merge remote-tracking branch 'origin/develop' into windows_ready 2023-06-11 05:45:50 -07:00
ee4b230947 Bugfix for compiling without uldaq
Some checks failed
continuous-integration/drone/push Build is failing
2023-06-11 05:45:28 -07:00
3904abfcf9 Merged in develop 2023-06-11 05:45:02 -07:00
a58be3ab87 Simple input tests script
Some checks failed
continuous-integration/drone/push Build is failing
2023-06-11 14:44:15 +02:00
f9640a5f99 Some small changes. 2023-06-11 05:33:16 -07:00
9b724ab9d5 Made thread pool itself thread safe. Besides, added some extra safety for StreamMgr singleton instance allocation.
Some checks failed
continuous-integration/drone/push Build is failing
2023-06-10 15:47:52 +02:00
21df1bc6cf Incallbacks should not return anything anymore. From inheritance to composition for InDataHandler code. StreamMgr singleton only weak ptr stored, this makes sure destruction from Python is more often done. UlDAQ code back to working.
All checks were successful
continuous-integration/drone/push Build is passing
2023-06-09 10:43:04 +02:00
028bed9229 One forgotten debugtrace back to disabled 2023-06-07 21:51:03 +02:00
c87a5cec25 StreamMgr handle now via shared pointers. InDataHandler stores weak pointers. Reset callback in PyInDataHandler could be problematic. Refactored the UlDaq code and moved to a subfolder. 2023-06-07 21:49:07 +02:00
6fc1bd90b1 Moved IndataHandler to its own implementation file. Refactored some code. Fixed race conditions when starting and stopping indatahandlers. It appears that this does not solve the segfault, but is at least mitigates some race conditions when constructors are not ready on an object, and avoiding the call of virtual functions of an object which destructor has already been called. Added some extra assert check that a function is called from the right thread. Put explicit start and stop methods in constructor / destructor of PyInDataHandler. WARNING: this means all .start() and .stop() methods should be removed. THIS IS AN API break!
All checks were successful
continuous-integration/drone/push Build is passing
2023-06-06 16:05:24 +02:00
dd2bbb5973 Some improvements in the clearyness of meaning in uldaq code. No bugs found. 2023-06-06 15:57:20 +02:00
ae3f8043e0 Bugfix: not cleanup done of h5 dataset in recording. That might be problematic
All checks were successful
continuous-integration/drone/push Build is passing
2023-06-02 14:25:17 +02:00
0d02779f2e Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into windows_ready
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-25 11:43:14 -07:00
9617da3ad9 Updated libs. Some comments and tests on cmake with msys2.
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-25 11:41:16 -07:00
43cf2427ea Workaround for bug in RtAudio when first channel not equal to 0
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-25 16:52:55 +02:00
9ec2abeced Changed remote of uldaq to asceenl
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-16 12:13:21 +02:00
a1a7b411f1 Updates and bugfixes on fromnpy in Measurement
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-16 12:12:36 +02:00
34729cf9c0 Destroythreadpool waits forever. Try with ucrt64
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-12 08:27:35 -07:00
93619a344c Bugfix in debugtrace such that it works with MinGW
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-12 07:00:12 -07:00
318a565e17 Not forcing any RtAudio backend. This is still te be found out what works properly
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-12 06:41:16 -07:00
3e6c8cf3b2 Working to execute cpp code of LASP on Windows. Streams are not working in ACME
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-03 12:44:32 -07:00
a0bbeea24d Merge branch 'develop' into windows_ready
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-21 13:30:53 +02:00
24de84a4f7 Some doc update
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-21 13:27:45 +02:00
ebf5ac3de4 Merge branch 'develop' into windows_ready
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-19 12:36:39 -07:00
ad864ddb4a Added scripts and debugged cmake to make compile windows ready. Now it compiles, bug the problem is, we have DLL load failed
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-19 12:36:32 -07:00
3844827505 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-19 15:56:35 +02:00
fb9920d00a Bugfix: Made Uldaq sample rate check depending on actually provided sample rates 2023-04-18 11:09:01 +02:00
e09b00d801 Changed argument of Measurement.exportAsWave() from newsampwidth to dtype, to allow export as float
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-14 17:04:27 +02:00
f1348ede80 Cached time string of measurement time stamp
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-03 13:16:39 +02:00
bdef0b45f3 Added first-order HP and LP compensation filters to the biquad class
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-22 16:23:57 +01:00
3f0d9f4b00 Bugfix 1 in Uldaq code
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-15 15:53:02 +01:00
ad0076e1c9 Changed remote of Uldaq to our fork
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-15 15:42:40 +01:00
ad62917aab Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-13 10:38:23 +01:00
14126c8b9c Added extra newlines in README. Hopefully this fixes the markdown problems 2023-03-13 10:38:09 +01:00
f164aa2e71 Important BUG: opening a measurement tried to load the comment from the wrong place. Was stored as an attributed but was tried to recover as a dataset.
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-12 13:02:18 +01:00
ec2a933e20 Important BUGfix: effectively there was no sleep period in the thread handling the data from the UlDAQ
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-10 16:27:51 +01:00
617eded04e Bugfix for non-consecutive channel counts in UlDAQ
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-10 15:53:55 +01:00
2b22af5d2c Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-10 15:44:48 +01:00
92f5b18481 Not allowing a monitor when not running in duplex mode 2023-03-10 15:44:19 +01:00
8547d0915a Added low-pass and high-pass compensator filters
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-09 10:16:44 +01:00
fa8f5e64ad Update to new smoothing algorithm. Should be made faster.
All checks were successful
continuous-integration/drone/push Build is passing
2023-02-23 18:10:06 +01:00
b3fb7ddb6d Smoothing: minor bug fix
All checks were successful
continuous-integration/drone/push Build is passing
2023-02-23 16:37:08 +01:00
28d540b667 Merge remote-tracking branch 'origin/rt_signalviewer' into rt_signalviewer
Some checks failed
continuous-integration/drone/push Build is failing
2023-02-20 10:03:25 +01:00