|
|
3dce1e46f9
|
Merge branch 'main' into test
|
2020-11-20 14:25:45 +01:00 |
|
|
|
08ecc1e52d
|
Merge branch 'main' into test
|
2020-11-20 14:24:14 +01:00 |
|
|
|
8c1974b34e
|
Merge branch 'main' into test
|
2020-11-20 14:13:20 +01:00 |
|
|
|
d89d349247
|
Merge branch 'main' into test
|
2020-11-20 14:10:35 +01:00 |
|
|
|
910961cf41
|
Merge branch 'main' into test
|
2020-11-20 14:05:53 +01:00 |
|
|
|
595b7aa5e8
|
Merge branch 'main' into test
|
2020-11-20 14:03:36 +01:00 |
|
|
|
f72ad4326f
|
Merge branch 'main' into test
|
2020-11-20 14:00:47 +01:00 |
|
|
|
2306e44ae3
|
Merge branch 'main' into test
|
2020-11-20 13:02:36 +01:00 |
|
Dhanya Thattil
|
e7eee67fed
|
Update RELEASE.txt
|
2019-06-13 11:44:43 +02:00 |
|
Dhanya Thattil
|
f36a12e454
|
Release Notes typo: jungfrau min exptime is 50ns and not 50 us (#16)
|
2019-05-02 15:28:03 +02:00 |
|
Erik Frojdh
|
d7ce5fedfd
|
path
|
2019-02-12 15:06:15 +01:00 |
|
Erik Frojdh
|
3a2682ffe7
|
missing headers updated build number
|
2019-02-12 14:46:56 +01:00 |
|
Erik Frojdh
|
bf74a4135e
|
travis
|
2019-02-11 10:25:58 +01:00 |
|
Erik Frojdh
|
252ecf2769
|
travis
|
2019-02-11 10:15:57 +01:00 |
|
Erik Frojdh
|
de01ab75e9
|
travis
|
2019-02-11 09:24:39 +01:00 |
|
|
|
a7ba5eb0d8
|
updated release.txt
|
2019-02-08 17:46:13 +01:00 |
|
|
|
6bf1a944da
|
updaterev
|
2019-02-08 17:28:44 +01:00 |
|
|
|
3c77447868
|
removed minor warnings
|
2019-02-08 16:32:23 +01:00 |
|
|
|
046fb11e5e
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-08 16:02:15 +01:00 |
|
|
|
b89d56001e
|
CMake: prefixing the options with SLS_
|
2019-02-08 16:02:05 +01:00 |
|
Erik Frojdh
|
de204dee38
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-08 14:03:56 +01:00 |
|
Erik Frojdh
|
0ef030354f
|
warning
|
2019-02-08 14:03:49 +01:00 |
|
|
|
dccce9bf55
|
Merge branch 'esrf-bliss-add-targets-export-name' into 4.0.1-rc
|
2019-02-08 13:09:06 +01:00 |
|
|
|
441c3dc5db
|
Merge branch 'add-targets-export-name' of https://github.com/esrf-bliss/slsDetectorPackage into esrf-bliss-add-targets-export-name
Pull request from Samuel ESRF
|
2019-02-08 13:07:08 +01:00 |
|
|
|
afd9e29424
|
updated release.txt to have eriks bug fix for receiver gap pixels enable in reciever
|
2019-02-08 12:53:58 +01:00 |
|
|
|
ce939b3cd6
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-08 12:45:45 +01:00 |
|
|
|
0984654fd0
|
updated release.txt
|
2019-02-08 12:33:04 +01:00 |
|
Erik Frojdh
|
cd738106ec
|
printf and uninitialized variables
|
2019-02-08 11:14:16 +01:00 |
|
Erik Frojdh
|
0e120330f4
|
fixed comparisons to build with clang
|
2019-02-08 10:16:32 +01:00 |
|
|
|
bf0e0ac601
|
updated binaries in serverbin
|
2019-02-07 17:06:07 +01:00 |
|
|
|
143682cfb1
|
updaterev
|
2019-02-07 16:55:01 +01:00 |
|
|
|
22686e1e25
|
eiger server bug fix: getmeasured period and exptime gets 32 bit from Febinterface and needs to be casted to int64_t before multiplying by 10
|
2019-02-06 14:52:52 +01:00 |
|
Samuel Debionne
|
e13ecc8625
|
Add slsReceiver and slsDetector targets to the export set (used by donwstream project)
set TARGETS_EXPORT_NAME if the project is built directly.
|
2019-02-05 11:51:03 +01:00 |
|
|
|
ef3e01b9bd
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-05 10:49:46 +01:00 |
|
Gemma Tinti
|
dffa4d9de5
|
eiger manual
|
2019-02-05 10:46:37 +01:00 |
|
|
|
dfca81208b
|
manual acq: uncomment insignificant
|
2019-02-05 10:36:33 +01:00 |
|
|
|
37be7d0e2b
|
manual acq config added
|
2019-02-04 17:54:58 +01:00 |
|
|
|
49812a34ae
|
manual acq changes for debugging
|
2019-02-04 17:31:58 +01:00 |
|
|
|
133b82ad61
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-04 16:43:44 +01:00 |
|
|
|
61e769773b
|
got rid of insignificant printouts from debugging
|
2019-02-04 16:43:37 +01:00 |
|
Erik Frojdh
|
23dce681b2
|
added clang format and clang tidy from refactor
|
2019-02-04 14:11:06 +01:00 |
|
|
|
7481c7f0e6
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-01 18:50:08 +01:00 |
|
|
|
3c2bbf6ad4
|
gotthard server: possible fix for master and slave sync problem when configuring mac for different frames and sending dummy image, still problem of missing or extra 2 packets inslave or master not sending any frames sometimes, multi: possible fix of image reconstruction in x direction in gui
|
2019-02-01 18:48:51 +01:00 |
|
|
|
b8fec6c050
|
gotthard server: possible fix for master and slave sync problem when configuring mac for different frames and sending dummy image, still problem of missing or extra 2 packets inslave or master not sending any frames sometimes
|
2019-02-01 18:48:25 +01:00 |
|
|
|
2f11681d3f
|
gotthard server: configmac should also set cycles for sending dummy frame
|
2019-01-30 18:24:25 +01:00 |
|
|
|
12f8166d25
|
manual acq changed config file, added some changes for jungfrau that aren;t tested, but soleil acq test passed
|
2019-01-29 15:49:41 +01:00 |
|
|
|
fd68a41918
|
udp socket creation error, udpsocket assigned only after. unique ptr later
|
2019-01-16 19:46:08 +01:00 |
|
Erik Frojdh
|
d45375947f
|
only destroy sem if it was initialized
|
2019-01-16 11:53:16 +01:00 |
|
Erik Frojdh
|
73ae8c6151
|
removing static libs
|
2019-01-15 17:24:20 +01:00 |
|
|
|
615dd2a84f
|
jungfrau server: minor change
|
2019-01-07 12:06:04 +01:00 |
|
