2038 Commits

Author SHA1 Message Date
Dhanya Maliakal
d9809925af debugging statements 2015-05-12 14:28:13 +02:00
bd3466b04f Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-05-04 13:49:10 +02:00
ba377ec273 Command adcreg added to write to adc registers 2015-05-04 13:48:46 +02:00
9f8ed3a4b5 Added more debug messages for DMARTIN flag 2015-04-28 17:19:04 +02:00
992a298abc added dunny implementation as an example to combine TCPIP interface and custom UDP reciever 2015-04-21 15:09:50 +02:00
7f7e7ca727 Fixed serial assignment. If top=1, serial=0 and vice versa. 2015-04-21 11:57:31 +02:00
8a8e1b7130 Remove -DMARTIN as default flag 2015-04-21 11:11:32 +02:00
l_brueckner_m
399ae4e669 Added colors for MARTIN debug prints 2015-04-20 18:22:29 +02:00
l_brueckner_m
39cd82f0b8 Added Backend board FPGA temperature support 2015-04-20 18:20:02 +02:00
Dhanya Maliakal
e483141a15 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-04-15 14:49:32 +02:00
Dhanya Maliakal
8f4c2001ae warning fixed 2015-04-15 14:49:06 +02:00
a513ff2c79 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-04-15 10:16:44 +02:00
Dhanya Maliakal
15bbb099d3 for mapping 32 bit eiger 2015-04-14 17:11:56 +02:00
Dhanya Maliakal
6cd28165ca top image reconstruct works with make flga 2015-04-10 17:11:26 +02:00
31f06fb567 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-04-10 10:08:34 +02:00
0c7f2bdceb Changes to pattern generator and jungfrau server 2015-04-10 10:08:12 +02:00
Dhanya Maliakal
ee0c6c4a05 1 sec usleep to stop receiver for eiger 2015-03-31 15:00:57 +02:00
Dhanya Maliakal
b4f995084c Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-03-31 14:59:49 +02:00
Dhanya Maliakal
9d3a171a28 1 sec usleep to stop receiver for eiger 2015-03-31 14:59:26 +02:00
Dhanya Maliakal
b5e8c104db printouts for eigermapping 2015-03-31 14:45:41 +02:00
714e1a7f72 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-03-31 13:55:21 +02:00
1edcdff936 Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1 2015-03-31 13:54:59 +02:00
Dhanya Maliakal
e35867227f writing frame number to the file for eiger 2015-03-30 17:16:31 +02:00
Dhanya Maliakal
031ccdf070 change to server for no serial to work 2015-03-30 15:36:55 +02:00
Dhanya Maliakal
ea4f596077 removed conflicts 2015-03-26 11:29:29 +01:00
Dhanya Maliakal
1611dde9d4 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detectors_package 2015-03-25 15:37:31 +01:00
Dhanya Maliakal
24bcb04372 included flag for eiger fifo debug 2015-03-25 15:37:07 +01:00
Dhanya Maliakal
1ad0bc56e7 included slsDetectorUsers 2015-03-25 15:26:38 +01:00
248848c666 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-03-24 09:49:41 +01:00
f461ddf2b7 slsDetectorUSers re-added to Makefile - don't remove it again 2015-03-23 15:42:12 +01:00
1df89d4ce2 test 2015-03-23 11:41:19 +01:00
9e78bae614 solved bad_alloc 2015-03-23 11:18:24 +01:00
36191396b2 added pull.sh and fetch.sh 2015-03-13 13:35:40 +01:00
Dhanya Maliakal
477b2fb467 acquire works properly now 2015-03-12 16:47:20 +01:00
Dhanya Maliakal
89ad2112c6 difference between acquisition index and frame index 2015-03-12 12:25:23 +01:00
Dhanya Maliakal
7e44648da9 different between acquisition index and frame index 2015-03-12 12:22:19 +01:00
Dhanya Maliakal
6232c6584a put executables into git 2015-03-10 16:06:19 +01:00
Dhanya Maliakal
6063c712f7 copy first frame to latest data no matter what and also copy only if more than packets per frame 2015-03-10 15:04:50 +01:00
Dhanya Maliakal
7a2e42d59a changed the way gui polls receiver for data for nth frame and otherwise 2015-03-10 15:03:08 +01:00
cd67991357 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-03-06 10:43:22 +01:00
c7aea8f2a6 Some changes for the JCTB software 2015-03-06 10:43:05 +01:00
Dhanya Maliakal
2f82469531 fifo debug with color done 2015-03-05 15:21:12 +01:00
Dhanya Maliakal
cdd18182a8 resolved client side memory leak caused from gui 2015-03-04 16:24:03 +01:00
Dhanya Maliakal
24b9402e52 eiger ensures the mac address is the same as the software mac address 2015-03-03 16:35:52 +01:00
Dhanya Maliakal
7cca11637a include gemmas 1 module testing as well as multi module testing for serial 2015-03-03 14:23:05 +01:00
Dhanya Maliakal
2c69e45348 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-03-02 13:56:52 +01:00
Dhanya Maliakal
85ccf64175 print receiver configurations for all detectors added 2015-03-02 13:56:23 +01:00
ed50f83fe6 Added extra debug messages (-DMARTIN) 2015-03-02 12:12:23 +01:00
Dhanya Maliakal
5682a6b458 moved startframeindice to before stop listening for gotthard 2015-02-25 10:34:57 +01:00
Dhanya Maliakal
875ee02038 got ridf of warnings for eiger server 2015-02-25 10:34:18 +01:00