7163 Commits

Author SHA1 Message Date
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
10fa57ebb9 binaries updated to reflected developer branch 2020-11-19 16:44:40 +01:00
0ca9115cb8 updating client api branch back to developer 2020-11-19 16:43:58 +01:00
Erik Frojdh
06dbf82e93 clang-format 2020-11-18 18:01:39 +01:00
8565ac6cf2 update doc 2020-11-18 17:44:04 +01:00
a26f22a052 update doc 2020-11-18 17:35:48 +01:00
30f9d53520 update doc 2020-11-18 17:32:07 +01:00
7b81532f54 update doc 2020-11-18 17:27:34 +01:00
dcf0b58a6d update doc 2020-11-18 17:27:05 +01:00
e39ea64560 update doc 2020-11-18 17:10:43 +01:00
77dacdf40d wip doc 2020-11-18 16:24:28 +01:00
5397a9a78b update doc 2020-11-18 16:12:29 +01:00
3fbafb3c1d update doc 2020-11-18 14:38:54 +01:00
e3721e89e0 update doc 2020-11-18 14:34:01 +01:00
ec75728941 update doc 2020-11-18 14:22:36 +01:00
9b6a10d7ce cmk install directory and cmake 2020-11-18 12:22:19 +01:00
57904446f0 known issues firmware eiger stop 8 byte packet 2020-11-18 11:40:14 +01:00
3d48501d30 update documentation on customer receiver config 2020-11-18 11:33:35 +01:00
d364e5e2ec added custom receiver example 2020-11-18 11:17:15 +01:00
aacd7c4bec update client version 2020-11-18 10:44:35 +01:00
abfc0dc266 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-11-18 10:12:35 +01:00
85a6d82d9f bugfix hdf5 threshold ev 2020-11-18 10:12:27 +01:00
Erik Frojdh
56be47669f more cmake cleaning 2020-11-18 09:43:07 +01:00
Erik Frojdh
b96b1849cd minor 2020-11-18 09:15:17 +01:00
Erik Frojdh
902919f2df minor 2020-11-18 09:11:48 +01:00
Erik Frojdh
1efdc90719 clean 2020-11-18 08:57:35 +01:00
e852158b83 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-11-17 19:23:36 +01:00
f48eff49e9 gotthard2 server config file modified 2020-11-17 19:23:28 +01:00
f7ecabdb51 update release.txt 2020-11-17 19:07:56 +01:00
cbf61ed05e binaries in serverbin 2020-11-17 18:43:45 +01:00
8be579ea53 binaries name changed 2020-11-17 18:41:18 +01:00
7fcac35549 gui exception thrown from acquire caught properly in gui 2020-11-17 17:39:34 +01:00
6563965787 binaries in 2020-11-17 16:52:49 +01:00
73d582744e updated binaries for 5.0.0 2020-11-17 16:49:03 +01:00
fa8fdced5f updating client versioning 2020-11-17 16:46:39 +01:00
5142603103 update doc 2020-11-17 16:45:19 +01:00
Dhanya Thattil
2fa3ebd8e6
Merge pull request #216 from slsdetectorgroup/callbacksafe
Callbacksafe
2020-11-17 16:26:07 +01:00
a534271aff back to normal receiver 2020-11-17 16:21:39 +01:00
d2eed6177c Merge branch 'callbacksafe' of github.com:slsdetectorgroup/slsDetectorPackage into callbacksafe 2020-11-17 16:12:39 +01:00
ddf43dbd24 fix for Eiger firmware sending bad packets of size 8 bytes when doing a stop 2020-11-17 16:12:30 +01:00
Erik Frojdh
bfe8cb7020 Merge branch 'callbacksafe' of github.com:slsdetectorgroup/slsDetectorPackage into callbacksafe 2020-11-17 15:33:13 +01:00
Erik Frojdh
40f6eb8ede WIP 2020-11-17 15:33:09 +01:00
5c71dd7246 handling acquisitionfinished callback 2020-11-17 15:28:39 +01:00
146d605d19 gui callback exception caught 2020-11-17 14:01:53 +01:00
918f3f3fde handling get data rxr callback exceptions 2020-11-17 13:53:54 +01:00