|
|
6be47d936f
|
conflicts resolved
|
2019-02-14 17:32:33 +01:00 |
|
|
|
9aaca14b01
|
CMakeLists.txt: reordering and removing those we dont use anymore, removed all the Makefiles (except the ones for the detector servers)
|
2019-02-14 16:15:43 +01:00 |
|
|
|
aaae6d854c
|
changed remaining cmake options to have SLS_ prefix
|
2019-02-14 15:42:04 +01:00 |
|
|
|
c91c2c224a
|
Merge branch 'add-cmake-packages' of https://github.com/esrf-bliss/slsDetectorPackage into esrf-bliss-add-cmake-packages
|
2019-02-14 10:36:41 +01:00 |
|
|
|
2fdfd33f97
|
gitignore: added .o files for the servers
|
2019-02-14 09:30:50 +01:00 |
|
|
|
230b26a680
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-02-13 20:19:16 +01:00 |
|
|
|
46aa7769cc
|
client: added command line and for APIfor framemode and detectormode. Refactorinng required in the future
|
2019-02-13 20:19:08 +01:00 |
|
Erik Frojdh
|
59f3f0c764
|
cleaner cmake
|
2019-02-13 15:59:42 +01:00 |
|
Erik Frojdh
|
d46d96ecca
|
fixed linking zmq
|
2019-02-13 15:35:40 +01:00 |
|
Erik Frojdh
|
82584dd1a8
|
cmake
|
2019-02-13 15:13:21 +01:00 |
|
Erik Frojdh
|
b65e0a1f01
|
include dirs
|
2019-02-13 15:12:33 +01:00 |
|
Erik Frojdh
|
f9417a23e0
|
FindZeroMq
|
2019-02-13 14:53:23 +01:00 |
|
|
|
fd95550724
|
client: fix for json header values being integer
|
2019-02-13 12:43:56 +01:00 |
|
Samuel Debionne
|
c064dc84ae
|
Add generation and install of CMake packages
|
2019-02-13 10:45:01 +01:00 |
|
Samuel Debionne
|
01e3cb8d5e
|
Cherry pick commit from 4.0.1 about CMake packages
|
2019-02-13 09:44:45 +01:00 |
|
|
|
c6ac0f8ebc
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-02-13 09:37:45 +01:00 |
|
|
|
f9be8b89ac
|
added functionality to set additional json header key value pairs for prototype ctb, server fixed for eiger compile from ctb integration
|
2019-02-13 09:37:31 +01:00 |
|
Dhanya Thattil
|
75a75b6cf6
|
Merge pull request #3 from esrf-bliss/add-slsReceiver-ctor-overload
merge for Add slsReceiver ctor overload and sls::make_unique
|
2019-02-13 09:10:33 +01:00 |
|
Samuel Debionne
|
f125b94a7d
|
Use sls::make_unique<>
|
2019-02-13 08:59:26 +01:00 |
|
Samuel Debionne
|
b18391330e
|
Add slsReceiverUsers(int tcpip_port_no) overload
Use std::unique_ptr<> instead of raw pointers
|
2019-02-12 17:01:46 +01:00 |
|
Erik Frojdh
|
2bcf88e434
|
added receiverUsers as public header
|
2019-02-12 15:26:08 +01:00 |
|
|
|
031a11c4f7
|
removed all the warnings and errors from the merge, also removed added -wextra compiler flag, (yet to add additional commands for moench)
|
2019-02-12 11:09:19 +01:00 |
|
|
|
a64b34610a
|
merge from developer (without the additional json header implementations)
|
2019-02-12 09:35:24 +01:00 |
|
|
|
ed74e710d6
|
merge from 4.0.1
|
2019-02-11 14:37:54 +01:00 |
|
|
|
907d1655d1
|
merge from 4.0.1
|
2019-02-11 14:04:09 +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 |
|
|
|
985b2eba4d
|
ctb registers updated
|
2019-02-07 18:05:15 +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 |
|
|
|
a5ee9fbdba
|
ctb bug fixes: pattern generator, vchip, dacs
|
2019-02-07 16:51:18 +01:00 |
|
|
|
166541bd15
|
ctb adc phase get fix
|
2019-02-06 19:05:11 +01:00 |
|
|
|
140996fae6
|
ctb adc fix, update detector fix, acq error fix
|
2019-02-06 18:50:50 +01:00 |
|
|
|
3f43767d38
|
ctb client updated
|
2019-02-06 17:45:19 +01:00 |
|
|
|
a76cc90972
|
adc command line bug, ctb api added to client
|
2019-02-06 17:25:36 +01:00 |
|
|
|
0c1a3b7756
|
eiger bug fix: multi hv and eiger should not return -1 if different, ctb : dacs are 24 not 16
|
2019-02-06 17:07:13 +01:00 |
|
|
|
18ab437ae5
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
olddeveloper
|
2019-02-06 16:30:59 +01:00 |
|
|
|
3b56091e2f
|
new header for raw files
|
2019-02-06 16:30:37 +01:00 |
|
