966896b942
moench: get zmq goes to the receiver instead of shm, setand get threshold energey updates zmq and shm value, setand get roi anyways goes to the ddetector, so only updates zmq or gets it from rxr
2019-02-25 12:57:44 +01:00
4c7a9cd838
moench: set threshold energy and set roi sets jsonheader
2019-02-25 12:34:35 +01:00
c218e391bb
client: rx_tcpport fixed
2019-02-25 11:43:10 +01:00
43ad8b69b3
client: stop and control port get fixed
2019-02-25 09:35:07 +01:00
4c35dd9b5b
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2019-02-25 09:16:27 +01:00
15fc55f914
client: must print detector or receiver returning error
2019-02-25 09:16:20 +01:00
eecfcae312
ctbserver: dac -1 check limit error
2019-02-25 08:58:35 +01:00
Erik Frojdh
c723b29f9b
address and undefined behaviour sanitizers on debug
2019-02-22 19:55:56 +01:00
9b81143c68
Merge branch 'ctbFixes' into refactor
2019-02-22 13:58:51 +01:00
20edf61e30
ctb server: removed unnecessary prints, resulting in a bug fix for slow adc temp
2019-02-22 13:53:59 +01:00
a1a6a5dbaa
ctb server: slow adc temp fixed
2019-02-22 13:22:40 +01:00
a8121ae108
ctb server: vio should be off at start up
2019-02-22 09:03:30 +01:00
40d15264c5
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2019-02-21 16:25:07 +01:00
b2e6b78e20
Merge branch 'ctbBugFixes' into refactor
2019-02-21 16:24:56 +01:00
f5244faa02
moench: adding enums for zmq parameters, needs modification in naming
2019-02-21 16:01:24 +01:00
421dbdb9b5
ctb server: including moench as well for programfpga and other client ctb implementations
2019-02-21 16:00:40 +01:00
617f3d2600
ctb server: modified program fpag in case of errors
2019-02-21 15:56:51 +01:00
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
Erik Frojdh
29d4eb8b41
catch by ref
2019-02-20 10:29:15 +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
