a4f1b7670f
ctb server bug fixes:update client, get period left, getid(api and serial number), restrict setting vchip, allow write adc
2019-02-21 09:37:49 +01:00
09546a8632
ctb server:
...
- allowed flags resetfpga and programfpga for moench and ctb
- set a minimum voltage for vio as it powers the fpga (1200mV)
- changed the min and max for vchip and power regulators due to tolerance
- fixed pattern read function
- fixed minor bugs with input of ctb patterns(waittime) and mode other than 1
- fixed calibration current register for i2c for tolerance (/1.2268)
- fixed current readout of i2c
- added digital, analog and normal readouts for flags
2019-02-20 15:36:34 +01:00
775bde76c9
ctb server: power regulator adjusted for precision
2019-02-20 09:34:55 +01:00
d876cb6da6
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2019-02-20 08:47:13 +01:00
69f361468e
ctb: power regulators (set dac, get dac, get adc of voltage and current) works
2019-02-20 08:45:34 +01:00
Erik Frojdh
b52c6b05b8
link and format
2019-02-16 16:46:09 +01:00
c93f88b7e5
ctb server: fixed dacs, power regulators and vchip
2019-02-15 17:08:49 +01:00
Erik Frojdh
d0e1289c1b
replaced sprintf on the same buffer with strcat
2019-02-15 15:39:13 +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
d2ba206216
Merge branch 'findzmq' into refactor
2019-02-14 17:35:07 +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
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
985b2eba4d
ctb registers updated
2019-02-07 18:05:15 +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
076faa62e0
ctb server: server starts up good. Need to debug each function in detail
2019-02-06 15:50:44 +01:00
bb37915419
stdexcept added to compile
2019-02-05 14:44:49 +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
