2038 Commits

Author SHA1 Message Date
Dhanya Maliakal
74fc443db5 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-07-17 13:56:04 +02:00
Dhanya Maliakal
29c62b1721 offsets corrected for 1.5m 2015-07-17 13:55:02 +02:00
Dhanya Maliakal
26a42d8f67 new way 2015-07-17 13:29:23 +02:00
Dhanya Maliakal
ca9f195f0b starting of a new change 2015-07-16 13:33:34 +02:00
Dhanya Maliakal
476d1b452f some changes 2015-07-10 16:04:29 +02:00
Dhanya Maliakal
2ef27b718c updated gotthardserver to reflect v1.0 2015-07-09 16:59:13 +02:00
Dhanya Maliakal
fbfafb98fd small change 2015-07-03 16:10:04 +02:00
Dhanya Maliakal
5f0741d882 trimbits flipped and works correctly for top and bottom 2015-07-01 15:00:17 +02:00
Dhanya Maliakal
88e96d45e7 getting dr from rxr fixed 2015-06-30 17:21:45 +02:00
Dhanya Maliakal
a3a2db1f73 fixed 32 progress problem, and increased debugging 2015-06-30 17:20:23 +02:00
Dhanya Maliakal
f29f9b701d check detector mac matches hardware mac only for 1Gbe 2015-06-30 12:28:44 +02:00
Dhanya Maliakal
c4e0f2967f solved detector organisation in client side 2015-06-30 11:54:13 +02:00
Dhanya Maliakal
3600fb6304 git rev in 2015-06-29 16:57:16 +02:00
Dhanya Maliakal
8202e4aa0a git rev in 2015-06-29 16:56:34 +02:00
Dhanya Maliakal
4ebc9dffac git rev in 2015-06-29 16:55:26 +02:00
Dhanya Maliakal
7e02a9d3d1 resolved flip bytes in eiger 2015-06-26 15:57:28 +02:00
Dhanya Maliakal
237c5286ca includes dynamic range in offline headers for eiger 2015-06-26 11:49:26 +02:00
Dhanya Maliakal
f3d5de70bf firmware version for eiger added 2015-06-22 17:09:47 +02:00
Dhanya Maliakal
aa94f2f7be write headers is compulsory for eiger and shouldnt be in makefile 2015-06-16 16:28:53 +02:00
Dhanya Maliakal
8b282e3bbe write headers is compulsory for eiger 2015-06-16 16:28:24 +02:00
Dhanya Maliakal
9a61841ac7 git version update 2015-06-16 12:00:02 +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
Dhanya Maliakal
8323f81e8a beb includes read, write functions, so that it doesnt have to go to locallink interface 2015-06-15 17:41:48 +02:00
Dhanya Maliakal
bcf8d40fd2 minor changes, but posted semaphore in stop receiver so rxr not waiting forever for gui when it will never come 2015-06-12 17:46:50 +02:00
Dhanya Maliakal
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
2b05ceb281 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-06-12 13:00:21 +02:00
de0f35afb3 some jctb changes 2015-06-12 13:00:13 +02:00
Dhanya Maliakal
67628c74e1 removed all the scripts for just gitall 2015-06-11 12:35:53 +02:00
Dhanya Maliakal
aa29f12bb8 removed all the scripts for just gitall 2015-06-11 12:34:44 +02:00
Dhanya Maliakal
13b35b319c removed all the scripts for just gitall 2015-06-11 12:34:15 +02:00
Dhanya Maliakal
aca95703a9 tiny changes 2015-06-11 11:42:44 +02:00
b27f691d03 Revert "Solved merge conflicts"
This reverts commit c222221d18bd5db7d9a8c86071fe2fbdc0ce25ac.
2015-06-11 11:30:40 +02:00
28ed7d6b2d Solved merge conflicts 2015-06-11 11:25:49 +02:00
b193237df3 Making eigerDetectorServer running with the new firmware (request frames/packets is now done in HW) 2015-06-11 11:19:51 +02:00
Dhanya Maliakal
fdaca88225 includes 32 bit subframes 2015-06-10 13:26:51 +02:00
Dhanya Maliakal
849d0de5cb not much valuable change 2015-06-10 12:23:38 +02:00
Dhanya Maliakal
4f88e831c4 checks if receiver udp object was created before executing functions and hence always returns a ret 2015-05-26 17:01:42 +02:00
Dhanya Maliakal
c0dac6fd27 receiver can return fail for a get and a message 2015-05-26 17:00:07 +02:00
Dhanya Maliakal
cb51de145b Merge branch 'startlater' 2015-05-26 12:31:51 +02:00
Dhanya Maliakal
99196aa272 ignore 16 byte messages 2015-05-26 12:08:21 +02:00
Dhanya Maliakal
ee4fa791be interleaving request messages to different ports of eiger detector 2015-05-26 12:07:43 +02:00
Dhanya Maliakal
ee8b0b2ee7 knowing which repo 2015-05-22 10:22:53 +02:00
Dhanya Maliakal
c840305189 starting receiver only at set detector type works 2015-05-21 17:39:17 +02:00
Dhanya Maliakal
2cd2dbadc0 included scripts for diff and status 2015-05-21 11:18:04 +02:00
Dhanya Maliakal
9c66e96770 receiver stop command line should not have receiver readout, acquire doesnt hacve it anymore 2015-05-21 11:11:17 +02:00
Dhanya Maliakal
302d9ca0ed added the code for toggle bit to know when acquisition started in febcontrol and list, indentation as well 2015-05-20 12:01:49 +02:00
Dhanya Maliakal
92dfb366f6 gemma offline reading works 2015-05-19 10:12:09 +02:00
Dhanya Maliakal
1f1581a1fa no_serial was merged to master 2015-05-13 14:41:25 +02:00
Dhanya Maliakal
49b0dce727 not significant 2015-05-13 10:30:39 +02:00
Dhanya Maliakal
11f6d883be Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-05-12 14:28:48 +02:00