|
|
69f361468e
|
ctb: power regulators (set dac, get dac, get adc of voltage and current) works
|
2019-02-20 08:45:34 +01:00 |
|
|
|
4a8a72c447
|
ctb server: vlimit not impl, adc in degrees
|
2019-02-14 18:28:32 +01:00 |
|
|
|
501c579f6b
|
users: added json parameter for moench api
|
2019-02-14 18:03:49 +01:00 |
|
|
|
722883531d
|
reverted json_emin, emax, framemode and detectormode. All json parameters for moench will go through rx_jsonpara using strings
|
2019-02-14 17:43:28 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a5ee9fbdba
|
ctb bug fixes: pattern generator, vchip, dacs
|
2019-02-07 16:51:18 +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 |
|
Erik Frojdh
|
536c853d79
|
hack for receiver port
|
2019-01-25 19:41:33 +01:00 |
|
Erik Frojdh
|
f1d055138c
|
moved updateDetector/Receiver
|
2019-01-25 19:12:28 +01:00 |
|
Erik Frojdh
|
82ce6b639c
|
more cout
|
2019-01-25 16:53:19 +01:00 |
|
Erik Frojdh
|
7d9417dffe
|
fixed debug couts
|
2019-01-25 16:48:04 +01:00 |
|
Erik Frojdh
|
89ee1d5bcf
|
new socket for slsDetector
|
2019-01-25 16:44:29 +01:00 |
|
Erik Frojdh
|
a1c0d28ddb
|
changed constructor
|
2019-01-24 11:12:24 +01:00 |
|
Erik Frojdh
|
99a1c609f1
|
starting to add new Socket interface
|
2019-01-23 11:47:13 +01:00 |
|
Erik Frojdh
|
b200138730
|
data types and format
|
2019-01-21 14:43:24 +01:00 |
|
Erik Frojdh
|
a4fec1e750
|
format and no check before delete
|
2019-01-21 12:10:00 +01:00 |
|
Erik Frojdh
|
46036e5dde
|
braces around statements
|
2019-01-21 11:41:19 +01:00 |
|
Erik Frojdh
|
d2ed245d1d
|
format and removed nullptr check before delete
|
2019-01-21 11:18:27 +01:00 |
|
Erik Frojdh
|
b74aed91dc
|
consistent naming between header and source file
|
2019-01-21 11:11:39 +01:00 |
|
Erik Frojdh
|
e1ec60c9c1
|
cleaning up tests for command line parser
|
2019-01-21 10:45:43 +01:00 |
|
Erik Frojdh
|
603b217b54
|
clang-tidy modernize
|
2019-01-18 15:15:39 +01:00 |
|
Erik Frojdh
|
449e4da892
|
removed potential memory leak in readSettingsFile
|
2019-01-18 15:13:17 +01:00 |
|
Erik Frojdh
|
1ec9d950d5
|
malloc to new
|
2019-01-18 15:00:52 +01:00 |
|
Erik Frojdh
|
1b28cc88ff
|
step one project reorganization
|
2019-01-18 14:41:04 +01:00 |
|
Erik Frojdh
|
8d6ee6ff46
|
moved shm deleted .project
|
2019-01-18 11:40:10 +01:00 |
|
Erik Frojdh
|
10539f8533
|
new getDetectorType functions
|
2019-01-18 10:53:49 +01:00 |
|
Erik Frojdh
|
eff17371a5
|
removed virtual
|
2019-01-17 17:30:36 +01:00 |
|
Erik Frojdh
|
b07492be6f
|
removing multiSlsDetectorCommand and using namespace std
|
2019-01-17 14:45:51 +01:00 |
|
Erik Frojdh
|
c05829031f
|
removed get from the users class and changed put
|
2019-01-17 14:20:03 +01:00 |
|
Erik Frojdh
|
76da6a07aa
|
using new CmdLineParser
|
2019-01-16 18:46:34 +01:00 |
|
Erik Frojdh
|
db0807bf7b
|
adding cmdline parser
|
2019-01-16 16:50:19 +01:00 |
|
Erik Frojdh
|
49f71ffca7
|
project wide nullptr fix
|
2019-01-16 15:15:29 +01:00 |
|
Erik Frojdh
|
80a1a3d796
|
moved ClientInterface to src
|
2019-01-16 15:10:24 +01:00 |
|
Erik Frojdh
|
683a859d4c
|
cleanup
|
2019-01-16 14:56:01 +01:00 |
|
Erik Frojdh
|
0f688bb249
|
unique_ptr in multiSlsDetectorClient
|
2019-01-16 14:27:08 +01:00 |
|
Erik Frojdh
|
68545f2b26
|
removed pointer in multiSlsDetectorClient
|
2019-01-16 10:56:51 +01:00 |
|
