88 Commits

Author SHA1 Message Date
b58c3e8951 solving merging conflicts from 3.1.0 to developer 2018-03-14 15:45:35 +01:00
1f6c289fd4 gotthard server : bugfix for getting id 2018-02-27 14:33:58 +01:00
618f6291cf server binaries for all, jungfgrauserver with adcphase returning something, serverclient interface fixed for others not using tempcontrol, detectornumber not used for settings file for non eiger/mythen, server dates removing rev number 2018-02-07 09:23:52 +01:00
Dhanya Maliakal
c4a242e10a changed all variables from svn to git, included --version for receiver binary 2017-12-06 10:29:57 +01:00
Dhanya Maliakal
a583f3d6e2 some more changes to make file for automatic versioning 2017-07-10 11:18:41 +02:00
Dhanya Maliakal
b05e9c194a makefiles and versioning update complete 2017-06-29 17:10:10 +02:00
Dhanya Maliakal
56645a48af added updateversion into makefile while compiling 2017-06-28 10:54:27 +02:00
Dhanya Maliakal
7239ce083b updaterev 2016-08-12 11:17:39 +02:00
Dhanya Maliakal
56aaaaf182 fixed rate correction to not include 16 bit dr 2016-08-08 15:52:09 +02:00
Dhanya Maliakal
b693279388 updaterev 2016-07-18 18:16:52 +02:00
Dhanya Maliakal
4939e47305 fixed dimensions, fixed rate corr bug, moved rate corr to server because config resets memory and ratecorr depends on client variables 2016-07-14 16:23:03 +02:00
Dhanya Maliakal
9c8137d892 updating versions 2016-07-06 10:32:57 +02:00
Dhanya Maliakal
418ff63999 updating versions 2016-07-05 17:24:44 +02:00
Dhanya Maliakal
e5fe5eab0d updating versions 2016-07-05 17:23:04 +02:00
Dhanya Maliakal
66a55ab15f updating versions 2016-07-04 15:50:58 +02:00
Dhanya Maliakal
cce41969f9 made only master set high voltage, others dont complain. also updated version file 2016-06-13 19:05:53 +02:00
Dhanya Maliakal
451a2b5d11 renamed server executables 2016-03-21 11:16:07 +01:00
Dhanya Maliakal
4395aca607 aaded ansi and merged release to have changing dynamicrange and clock with eiger 2016-03-18 14:54:51 +01:00
Dhanya Maliakal
3bf899a3ca recompiled server with undefned enum changed 2016-03-18 11:12:20 +01:00
Dhanya Maliakal
64c0fdfaef fixed bug gotthard server: dynamic gain and confgain values 2015-10-23 11:30:37 +02:00
Dhanya Maliakal
0ea9cc34b0 changed gotthard dynamic gain value and fixed bug of writing settings enum with more offset to not mixup with conf gain value in firmware 2015-10-23 10:57:45 +02:00
Dhanya Maliakal
8202e4aa0a git rev in 2015-06-29 16:56:34 +02:00
Dhanya Maliakal
861753a5d1 formatted changes made by Martin, which inclded resolving fifo full problem, first frame problem; 32 bit mode sub frame and 16 byte ignore 2015-06-16 11:59:07 +02:00
Maliakal Dhanya
193c62dc42 updating version numbers 2014-12-08 10:20:09 +01:00
Maliakal Dhanya
ceb2d28281 symbolic link corrected to point ot correct location 2014-11-17 17:00:38 +01:00
Maliakal Dhanya
dd8f48929c the version given to esrf 2014-10-16 14:14:00 +02:00
18188cd095 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2014-10-01 10:39:23 +02:00
fec9a30e6a Added jungfrau detector server (not functional, though) 2014-10-01 10:38:47 +02:00
Maliakal Dhanya
d8c7201749 module udpport2 2014-09-26 11:18:59 +02:00
Maliakal Dhanya
62464441ee vtrimbit size and vthreshold common for eiger 2014-09-09 17:00:26 +02:00
Maliakal Dhanya
c5a4f357bf got rid of extra servers for eiger, converted to c and it works 2014-08-29 16:41:19 +02:00
Anna Bergamaschi
c4f8c4a2aa set_dac function updated for mythen and gotthard as well 2014-07-18 10:29:27 +02:00
Maliakal Dhanya
73ba765647 git version history 2014-06-03 13:55:41 +02:00
Maliakal Dhanya
35035405a0 git version history 2014-06-03 12:26:45 +02:00
Maliakal Dhanya
8788a060dd creating a separate receiver 2014-05-21 09:44:35 +02:00
l_maliakal_d
f55aebc79b minor changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@747 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-04 09:44:12 +00:00
l_maliakal_d
fded64f5b1 svn rev updates
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@729 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 17:51:45 +00:00
x04sa
a7ad6b5b66 solevd bug on trimbit retrieving
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@718 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-28 10:17:46 +00:00
l_maliakal_d
a4aa9d6d5c got rid of unnecessary printout
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@712 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-10 14:39:58 +00:00
l_maliakal_d
7d322231e5 got rid of unnecessary printout
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@711 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-10 14:39:30 +00:00
l_maliakal_d
0202d16d48 some more changes to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@692 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 14:18:30 +00:00
bergamaschi
65748059cc Added some commands for moench and modified the moenchServer
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@673 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-18 10:56:03 +00:00
l_maliakal_d
57d65fd59c semaphores , no usleep in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@660 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-04 13:10:14 +00:00
l_maliakal_d
594c6895f8 fixed the zooming problems for 2d
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@659 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-29 15:15:19 +00:00
l_maliakal_d
6c11ac1d66 working version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@658 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-27 15:45:27 +00:00
l_maliakal_d
3098664c8f fixed some probelems wuth scans for receiver and also scans for allframes/frameindex
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@654 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-16 12:59:42 +00:00
l_maliakal_d
557f2f90ec update svn rev
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@652 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-13 10:30:27 +00:00
l_maliakal_d
e7a5512e29 update rev
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@649 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-08 09:52:23 +00:00
l_maliakal_d
34af5c9be0 temporary solution is to restart and restop state machine many times till it works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@635 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-16 15:11:13 +00:00
l_maliakal_d
b5fb6be6df updated rxr to use 10 times less memory for moench and plugged possible memory leaks
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@634 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-12 09:24:55 +00:00