Commit Graph

49 Commits

Author SHA1 Message Date
Markus Rosenstihl
fc1701750e New DAMARIS release 0.18.1 2018-03-26 16:42:13 +02:00
Markus Rosenstihl
a05667a7c7 Fix T92: kernel modules are build for all kernel headers
general.cpp now compiles on stretch
debian/compat bumped from 7 to 9
2018-03-26 15:21:11 +02:00
Markus Rosenstihl
3f878d9746 Useless use of delete, causing SEGFAULT because base64length is on the stack not heap. Fixes T85 2018-03-19 21:09:10 +01:00
Markus Rosenstihl
59571b566d If libspcm is not found skip compiling drivers dependent on it. 2018-03-19 21:04:33 +01:00
Markus Rosenstihl
e48c1e86cf Merge ssh://r2d2/home/r2d2/damaris
Conflicts:
	backends/drivers/SpinCore-PulseBlaster/SpinCore-PulseBlaster.cpp
2017-07-04 18:08:19 +02:00
Markus Rosenstihl
2994973279 Changed backend for PB SP17 and M2i 2 channel card 2017-07-04 17:59:20 +02:00
Markus Rosenstihl
f45c4c8e76 sync mask readded 2017-07-04 17:58:36 +02:00
Markus Rosenstihl
36be8e00c6 This should make sure that the card is finnished recording
data, timeout forces a trigger event. The timout value is
obtained from the length of the job.
Fixes T57
2017-07-04 17:56:18 +02:00
Markus Rosenstihl
3bb26edf5e accidentally checked in test code 2017-05-05 08:44:41 +02:00
Markus Rosenstihl
449ae0c9ef New backend (with M2I40xx ADC card)
* enabled fc1_backend with M2I40xx ADC card
* debian package now depends also on the spcm and libspcm-linux kernel
* module and library from Spectrum
2017-03-10 13:20:44 +01:00
astromech
f0e9f43f2e M2i uses internal clock for sampling generation 2017-03-09 22:30:10 +01:00
Markus Rosenstihl
1dcf82aa28 flexible damaris backend not ready yet 2017-02-09 16:44:23 +01:00
Markus Rosenstihl
c83844775c added pectrum headers to copyright information file 2017-02-08 00:26:53 +01:00
Markus Rosenstihl
a742a66028 added copyright file 2017-02-08 00:22:02 +01:00
Markus Rosenstihl
d912132ac7 added correct changelog 2017-02-07 23:48:23 +01:00
Markus Rosenstihl
80e426bac5 Merge track:sources/git-damaris 2017-02-07 22:29:56 +01:00
Markus Rosenstihl
ce944d3e41 new backend, hopefully more flexible
changing gtklib to boost config file reader as that seems to be
easier and more c++ like. Also does boost provide more possibilities
in the future than glib2-
2017-02-07 22:27:25 +01:00
Markus Rosenstihl
984fd4dc83 clean up 2017-02-06 22:46:25 +01:00
astromech
c590c08e23 added .gitignore 2017-02-06 22:31:58 +01:00
astromech
e4b4309711 Fixed accidentally removed else test, ADC was never setted 2017-02-06 22:05:00 +01:00
Markus Rosenstihl
2dcee09192 fixed cmake build for spc kernel driver 2017-02-02 11:30:51 +01:00
Markus Rosenstihl
72b0d17a33 forgot to git add header 2017-02-02 08:15:23 +01:00
Markus Rosenstihl
3da3b70ddd AD5791 data and clock bits now settable via methods (like latch enable) 2017-02-01 18:17:43 +01:00
Markus Rosenstihl
921d0b8ead bumped revision and moved to git 2017-02-01 15:04:23 +01:00
Markus Rosenstihl
58a5dd0b18 wrong directory checked when building MI40xx driver 2017-01-26 16:57:53 +00:00
Markus Rosenstihl
4a308c6ddf cmake project now accepts SPC_SOURCE environment variable to build MI40xx binary kernel driver 2017-01-26 16:56:17 +00:00
Markus Rosenstihl
9836f0b073 new damaris-backends release 2017-01-25 16:48:59 +00:00
Markus Rosenstihl
59900098b7 cmake transition for backends completed; builds now debian package with new debhelper 2017-01-25 15:46:32 +00:00
Markus Rosenstihl
10c2f2d70c cmake is now build the kernel drivers properly 2017-01-20 09:58:42 +00:00
Markus Rosenstihl
e73407f64c cmake configurations
* pulseblaster kernel module now building with cmake
* each driver has own CMakeLists.txt
2017-01-19 21:27:35 +00:00
Markus Rosenstihl
acf0d04de2 Further cmake conversion 2017-01-19 11:48:08 +00:00
Markus Rosenstihl
f37932e1a7 preliminary CMake support 2017-01-19 08:09:51 +00:00
Markus Rosenstihl
64fb1ed1fe fixed a possible Bug in PulseBlaster
WAIT opcode is ignored if preceeding state is shorter than 120ns.
2017-01-16 16:01:31 +00:00
Markus Rosenstihl
974be4ec82 AD579 driver 2nd revision 2016-12-19 14:03:14 +00:00
Markus Rosenstihl
5b52fb3e5a Spectrometers with new computers show increasingly timeouts.
This can  be because the timer in the backen is not synchronized with the pulseblaster.
When the timer starts running >0.5s before the pulse program is started, a timeout could occur.
The current value of additional 0.5s is changed to 2s. This timer has nothing to do with the trigger line.

- fixes T21
2016-11-23 14:46:31 +00:00
Markus Rosenstihl
c8d76f06c3 pulseblaster_without_backend: removed trigger configuration and sync residuals 2016-10-27 15:21:24 +00:00
Markus Rosenstihl
0aca892718 pulseblaster_without_backend updated 2016-10-27 15:20:25 +00:00
Markus Rosenstihl
e12d64957c New pulseblaster_only driver (with DAC) 2016-10-27 14:41:54 +00:00
Markus Rosenstihl
0aaa1496dc puleblaster only backend 2016-10-20 17:57:18 +00:00
Markus Rosenstihl
912c3e0aaa fixed Makefile error 2015-11-27 16:44:31 +00:00
Markus Rosenstihl
17ac75d98b added preliminary AD5791 driver 2015-11-25 16:43:12 +00:00
Markus Rosenstihl
a02eb49fa1 added preliminary AD5791 driver 2015-11-25 16:39:34 +00:00
Markus Rosenstihl
cbd1017a95 fixed nasty bug leading to segfault with --no-omit-frame-pointer compile option in write_adcdata_base64 2015-11-17 16:34:32 +00:00
Markus Rosenstihl
505c6ca44d cleaned up xerces and some old-style-casts 2015-11-17 11:55:55 +00:00
Markus Rosenstihl
03552b0bb6 * changes need for jessie, migration to libxerces version 3
* web links in frontend changed: berlios does not exist anymore
2015-02-04 09:11:24 +00:00
Stefan Reutter
a8aba4e718 Sweep sweep 2014-08-01 14:21:32 +00:00
Stefan Reutter
b707321243 Fixed problem with incorrect ADC acquisition time for very short intervals. 2014-08-01 14:19:38 +00:00
Stefan Reutter
8b9aa05595 - Fixed a weird error message + string length bug 2014-08-01 14:18:05 +00:00
Markus Rosenstihl
5545917824 migrate to standard svn repo layout 2014-06-26 11:10:51 +00:00