Commit Graph

104 Commits

Author SHA1 Message Date
b11b7c1c09 beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable 2015-06-12 17:45:43 +02:00
39cd82f0b8 Added Backend board FPGA temperature support 2015-04-20 18:20:02 +02:00
7e44648da9 different between acquisition index and frame index 2015-03-12 12:22:19 +01:00
24b9402e52 eiger ensures the mac address is the same as the software mac address 2015-03-03 16:35:52 +01:00
875ee02038 got ridf of warnings for eiger server 2015-02-25 10:34:18 +01:00
d658799b20 eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing 2015-02-23 15:18:02 +01:00
4649de2742 some changes for better testing in eiger server, including using set receiver, and changed to top/bottom instead of master slave 2014-11-28 14:26:19 +01:00
194b41bfc5 changes to get index in eiger server 2014-11-17 14:46:28 +01:00
b24f374155 setting number of frames had a bug in eiger server, refactored code a bit 2014-10-20 17:33:22 +02:00
bbf26927dd full module server works now, slave and master yet to be done 2014-10-14 15:38:45 +02:00
347a36b7c1 module acquisition works, edit getrunstatus, added a small code for master incomplete, adjusted server to look for element in position 1 instead of zero 2014-10-06 11:01:51 +02:00
d8c7201749 module udpport2 2014-09-26 11:18:59 +02:00
62464441ee vtrimbit size and vthreshold common for eiger 2014-09-09 17:00:26 +02:00
c5a4f357bf got rid of extra servers for eiger, converted to c and it works 2014-08-29 16:41:19 +02:00
7e46a407c6 added trimval function, but sending trimbits from char to int bug 2014-07-21 16:39:36 +02:00
828a2dbd17 10Gbe, some functions in gotthard and eiger servers including mv in dacs, mv in dacs, changing settings file 2014-07-11 13:06:48 +02:00
018b800117 eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working 2014-07-02 10:55:32 +02:00
0ee11cffb3 merged Ians section of the code and added a few functionalities 2014-05-28 18:04:26 +02:00
de319249cd latest update from Ian in eiger server 2014-05-27 15:03:08 +02:00
5fcec01a31 included configuremac in eigerserver 2014-05-26 18:01:52 +02:00
28a8a3c79f opened the eiger detector server to configuremac commands 2014-05-26 17:09:26 +02:00
ac350640f3 getmoduleid etc does not apply to eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@810 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 08:43:04 +00:00
7dcf83ab28 gt server workign back in c for eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@785 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 11:01:32 +00:00
f6b9f58721 few receiver functionalities implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@784 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-14 11:00:31 +00:00
0837c6b0a6 swapping ret when sending and then checking it to to send mess doesnt work. fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@770 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-12 10:15:09 +00:00
41140c882a 2nd ci, Eiger class added, DAC test
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@669 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 13:18:02 +00:00
2218a2e7e5 corrected enums, typecasted mallocs, changed eiger server to compile only in c++
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@665 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-13 07:02:15 +00:00
23bbefd4a2 trying to get atomic circular fifo
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@663 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-12 10:06:03 +00:00
036d72fec8 eiger server edited to include set timer, settingsand stop server for the time being
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@631 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-11 09:06:37 +00:00
8720f960e7 implemented getting ids for eiger. also id ret should be int64_t
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@630 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-10 15:58:43 +00:00
5a2018fc6f get id small change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@622 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-21 14:22:54 +00:00
af22e53a16 eiger setting dac works now and setsettings.. need to work on trimbits
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@621 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-20 09:25:21 +00:00
dc06c6e40e enum for idac works now..
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@618 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-20 08:45:43 +00:00
157292ac68 small errors
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@613 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:32:13 +00:00
58824d6d72 some swapping functions for big and little endian for eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@602 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-13 13:28:12 +00:00
91adb03daa temp changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@593 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-12 10:08:45 +00:00
5e4feb9705 basic common working version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@592 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-11 11:44:46 +00:00
78aaedf243 servers, setupdetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@588 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 13:50:41 +00:00
bdbd91b485 basic changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@585 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 09:05:52 +00:00
cdddd92a9e some basic changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@582 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-29 08:24:33 +00:00
19a14c5861 eigerServerMakefile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@580 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-28 10:07:30 +00:00
666c73c988 edited call backs in receiver, got rid of uhrix callback, expose receiver read freq to user, got rid of wait for receiver t finish
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@577 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-27 09:11:26 +00:00
74bcbf0d9a break statenets
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@576 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-23 12:26:49 +00:00
19101fd2ec basic layout
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@575 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-23 11:35:47 +00:00
fa0ae04eb0 reverted the generic slsdetectorserver to Annas' format
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@570 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 15:27:17 +00:00
05a57ad3b0 removed slsdetectoserver to revert to Annas basic form
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@569 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 15:09:35 +00:00
22bd638f64 the gotthard receiver works for short frames, gui commented out for now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@444 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-30 16:41:36 +00:00
2b31e23f75 forgot to add some server files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@437 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:08:22 +00:00
1847eaf1d7 modified the server so that it has a firmware class as well to read/write fpga
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@435 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 08:02:37 +00:00
aefdcaa82e added stop server, the implementation part of the class, and edited slsDetectorServer to include the correct slsDetectorFunctionList.h
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@266 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-21 16:03:13 +00:00