|
|
5f0741d882
|
trimbits flipped and works correctly for top and bottom
|
2015-07-01 15:00:17 +02:00 |
|
|
|
a3a2db1f73
|
fixed 32 progress problem, and increased debugging
|
2015-06-30 17:20:23 +02:00 |
|
|
|
f29f9b701d
|
check detector mac matches hardware mac only for 1Gbe
|
2015-06-30 12:28:44 +02:00 |
|
|
|
c4e0f2967f
|
solved detector organisation in client side
|
2015-06-30 11:54:13 +02:00 |
|
|
|
8202e4aa0a
|
git rev in
|
2015-06-29 16:56:34 +02:00 |
|
|
|
4ebc9dffac
|
git rev in
|
2015-06-29 16:55:26 +02:00 |
|
|
|
f3d5de70bf
|
firmware version for eiger added
|
2015-06-22 17:09:47 +02:00 |
|
|
|
aa94f2f7be
|
write headers is compulsory for eiger and shouldnt be in makefile
|
2015-06-16 16:28:53 +02:00 |
|
|
|
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 |
|
|
|
8323f81e8a
|
beb includes read, write functions, so that it doesnt have to go to locallink interface
|
2015-06-15 17:41:48 +02:00 |
|
|
|
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 |
|
|
|
67628c74e1
|
removed all the scripts for just gitall
|
2015-06-11 12:35:53 +02:00 |
|
|
|
aa29f12bb8
|
removed all the scripts for just gitall
|
2015-06-11 12:34:44 +02:00 |
|
|
|
13b35b319c
|
removed all the scripts for just gitall
|
2015-06-11 12:34:15 +02:00 |
|
|
|
aca95703a9
|
tiny changes
|
2015-06-11 11:42:44 +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 |
|
|
|
c0dac6fd27
|
receiver can return fail for a get and a message
|
2015-05-26 17:00:07 +02:00 |
|
|
|
ee4fa791be
|
interleaving request messages to different ports of eiger detector
|
2015-05-26 12:07:43 +02:00 |
|
|
|
ee8b0b2ee7
|
knowing which repo
|
2015-05-22 10:22:53 +02:00 |
|
|
|
2cd2dbadc0
|
included scripts for diff and status
|
2015-05-21 11:18:04 +02:00 |
|
|
|
9c66e96770
|
receiver stop command line should not have receiver readout, acquire doesnt hacve it anymore
|
2015-05-21 11:11:17 +02:00 |
|
|
|
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 |
|
|
|
1f1581a1fa
|
no_serial was merged to master
|
2015-05-13 14:41:25 +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 |
|
|
|
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 |
|
|
|
399ae4e669
|
Added colors for MARTIN debug prints
|
2015-04-20 18:22:29 +02:00 |
|
|
|
39cd82f0b8
|
Added Backend board FPGA temperature support
|
2015-04-20 18:20:02 +02:00 |
|
|
|
e483141a15
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-04-15 14:49:32 +02:00 |
|
|
|
8f4c2001ae
|
warning fixed
|
2015-04-15 14:49:06 +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 |
|
|
|
ee0c6c4a05
|
1 sec usleep to stop receiver for eiger
|
2015-03-31 15:00:57 +02:00 |
|
|
|
b4f995084c
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-03-31 14:59:49 +02:00 |
|
|
|
9d3a171a28
|
1 sec usleep to stop receiver for eiger
|
2015-03-31 14:59:26 +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 |
|
|
|
031ccdf070
|
change to server for no serial to work
|
2015-03-30 15:36:55 +02:00 |
|
|
|
ea4f596077
|
removed conflicts
|
2015-03-26 11:29:29 +01:00 |
|
|
|
1611dde9d4
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detectors_package
|
2015-03-25 15:37:31 +01:00 |
|
|
|
24bcb04372
|
included flag for eiger fifo debug
|
2015-03-25 15:37:07 +01:00 |
|
|
|
1ad0bc56e7
|
included slsDetectorUsers
|
2015-03-25 15:26:38 +01:00 |
|
|
|
f461ddf2b7
|
slsDetectorUSers re-added to Makefile - don't remove it again
|
2015-03-23 15:42:12 +01:00 |
|
|
|
36191396b2
|
added pull.sh and fetch.sh
|
2015-03-13 13:35:40 +01:00 |
|
|
|
477b2fb467
|
acquire works properly now
|
2015-03-12 16:47:20 +01:00 |
|
|
|
7e44648da9
|
different between acquisition index and frame index
|
2015-03-12 12:22:19 +01:00 |
|
