|
|
020eaded36
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-05-01 13:11:16 +02:00 |
|
|
|
445da80df8
|
resolved warnings, also from esrf: todo: include changes in zmq
|
2017-05-01 13:11:10 +02:00 |
|
|
|
f937b8ca5d
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-05-01 12:21:07 +02:00 |
|
|
|
7901b6f463
|
Modified "calcChecksum" function in jungfrauDetectorServer/firmware_funcs.c to compute properly the new IP header checksum for a new application header of 48 bytes.
|
2017-05-01 12:14:06 +02:00 |
|
|
|
e9f6dcf479
|
strtok is not thread safe..used to set receiver udp ip etc to detector, fixed
|
2017-05-01 10:24:16 +02:00 |
|
|
|
264485c8ff
|
changed all -lpthread to -pthread
|
2017-05-01 09:53:37 +02:00 |
|
|
|
3525bb3f9f
|
changed all -lpthread to -pthread
|
2017-05-01 09:44:33 +02:00 |
|
|
|
78d1504d66
|
changed all -lpthread to -pthread
|
2017-05-01 09:39:19 +02:00 |
|
|
|
c6cb499758
|
added the jungfrau binary
|
2017-04-28 13:41:08 +02:00 |
|
|
|
bc57ea5725
|
added the binary
|
2017-04-28 11:31:12 +02:00 |
|
|
|
27f752ff9e
|
removed wrong edits in merging (not reflected in git browser, weird); changing server names anyway
|
2017-04-28 11:30:09 +02:00 |
|
|
|
b401a6c33b
|
in between stage
|
2017-04-04 11:20:38 +02:00 |
|
|
|
faefcc4799
|
Merge branch '2.3' into developer
|
2017-03-29 11:25:28 +02:00 |
|
|
|
1afb9e3e48
|
manual
|
2017-03-29 11:23:44 +02:00 |
|
|
|
09d3372cc0
|
manual
|
2017-03-29 10:11:16 +02:00 |
|
|
|
671587c029
|
manual
|
2017-03-29 10:09:52 +02:00 |
|
|
|
fb0b0b96ec
|
need to automize parameter passing
|
2017-03-24 16:58:17 +01:00 |
|
|
|
72d89fefc3
|
modified release
|
2017-03-24 16:58:00 +01:00 |
|
|
|
a11313fe96
|
removed copies
|
2017-03-24 15:15:30 +01:00 |
|
|
|
aba3a67b80
|
Merge branch '2.3' into developer
|
2017-03-24 14:20:38 +01:00 |
|
|
|
cacb4c9d93
|
updaterev
|
2017-03-24 13:42:11 +01:00 |
|
|
|
86490226ed
|
removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled
|
2017-03-24 13:41:56 +01:00 |
|
|
|
eb203c93b2
|
removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled
|
2017-03-24 13:41:30 +01:00 |
|
|
|
2bb8fa596a
|
from the merge of 2.3
|
2017-03-24 12:22:49 +01:00 |
|
|
|
bb52676f50
|
merged from 2.3 without udpstandard
|
2017-03-24 10:34:31 +01:00 |
|
|
|
536f8937cb
|
merging
|
2017-03-24 09:10:09 +01:00 |
|
|
|
e8b14f8c8a
|
done
|
2017-03-24 08:26:10 +01:00 |
|
|
|
aca09bcd4e
|
done
|
2017-03-24 08:25:50 +01:00 |
|
|
|
fdb4fa28db
|
retrying
|
2017-03-24 08:22:50 +01:00 |
|
|
|
93362963e2
|
removed changes for test
|
2017-03-24 08:12:38 +01:00 |
|
|
|
33a7375c72
|
changes to test
|
2017-03-24 08:12:10 +01:00 |
|
|
|
97bad0fcb9
|
changes
|
2017-03-24 08:06:09 +01:00 |
|
|
|
059711af37
|
retrying a test
|
2017-03-24 07:59:36 +01:00 |
|
|
|
f0c5106764
|
trying a test
|
2017-03-24 07:59:14 +01:00 |
|
|
|
4182615aa9
|
trying a test
|
2017-03-24 07:58:27 +01:00 |
|
|
|
ff2c42e921
|
Merge branch '2.3' into developer
|
2017-03-23 15:38:48 +01:00 |
|
|
|
44be9829d4
|
removed anna from support as she prefered it
|
2017-03-23 15:38:24 +01:00 |
|
|
|
e450f5ec6a
|
updaterev
|
2017-03-23 15:17:34 +01:00 |
|
|
|
70a7217353
|
changed the header size to a better number
|
2017-03-23 15:17:21 +01:00 |
|
|
|
7dfb1b7192
|
added a release text
|
2017-03-23 15:17:03 +01:00 |
|
|
|
da8d535dae
|
updaterev
|
2017-03-23 14:09:01 +01:00 |
|
|
|
404be013a2
|
changes to new callback arguments without filepointer
|
2017-03-23 14:08:43 +01:00 |
|
|
|
6d4c0d0d46
|
modified users for new callback argument without filepointer
|
2017-03-23 14:07:56 +01:00 |
|
|
|
54371bc6be
|
updaterev
|
2017-03-23 13:48:18 +01:00 |
|
|
|
5c230e2ac5
|
updaterev
|
2017-03-23 13:48:12 +01:00 |
|
|
|
0814f6369d
|
udpaterev
|
2017-03-23 13:46:16 +01:00 |
|
|
|
9e658e7947
|
udpaterev
|
2017-03-23 13:46:02 +01:00 |
|
|
|
bf57be309f
|
updated server
|
2017-03-23 13:44:44 +01:00 |
|
|
|
6f34dddb5a
|
changed the file header size t0 1kb and changed its description in the header
|
2017-03-23 13:41:37 +01:00 |
|
|
|
c47f2f3449
|
solved the gui 4 bit bug where no data was displayed: due to byterperchannel being int and a 0
|
2017-03-23 13:31:22 +01:00 |
|
