Erik Frojdh
4943983d10
det id const and ini shm in constructor
2019-03-15 10:15:42 +01:00
Erik Frojdh
9f724f0c0d
using only sls exceptions
2019-03-14 17:09:44 +01:00
Erik Frojdh
9639e480d9
new exceptions
2019-03-14 16:37:36 +01:00
Erik Frojdh
c9422befff
fixed loading trimbits
2019-03-14 10:21:18 +01:00
Samuel Debionne
db232ad00d
in Listener, remove raw pointers allocations, use unique_ptr instead.
...
Add an overload of sls::make_unique for array types.
2019-03-06 09:07:51 +01:00
08bd2378f4
slsReceiver bug fix affecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t
2019-03-04 09:41:20 +01:00
8939e23622
jungfrau feature:storagecell_delay added
2019-03-01 15:26:38 +01:00
8c067437e6
ctb moench: added feature set pattern mask and set pattern bit mask, removed CTB prefix for all the patern functions
2019-03-01 12:28:11 +01:00
35b1ad39f7
ctb moench: feature to set digital io pin delay, changed print from unsuccessful to failed, maxpatternlength in server is inclusive
2019-03-01 10:45:01 +01:00
bb81613900
ctb, moench: implemented led enable feature
2019-03-01 09:00:04 +01:00
debf3a1b01
ctb readout works with receiver for digital readout, allocate ram in server only if 1g udp, free addr info only when setting new udp detals upon configuring ,brough readout flags to receiver
2019-02-28 16:07:47 +01:00
7f2197fc4f
slsReceiver & client: 10genable allowed for moench and ctb, ctb server: better way to divide to packets to send via udp
2019-02-28 10:09:54 +01:00
f80483de6e
ctb server: (bug fixes, udp sending feature instead of tcp, better debugging prints,
...
digital readout mode (fifoempty flag in status register is always up, so it is idle for this readout mode),
pattern loop bugs, max_pattern_length redefined in server side, do not update period for ctb and moench in setreceiver
2019-02-28 08:46:26 +01:00
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
15fc55f914
client: must print detector or receiver returning error
2019-02-25 09:16:20 +01:00
f5244faa02
moench: adding enums for zmq parameters, needs modification in naming
2019-02-21 16:01:24 +01:00
Erik Frojdh
b52c6b05b8
link and format
2019-02-16 16:46:09 +01:00
Erik Frojdh
d0e1289c1b
replaced sprintf on the same buffer with strcat
2019-02-15 15:39:13 +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
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
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
b65e0a1f01
include dirs
2019-02-13 15:12:33 +01:00
Erik Frojdh
f9417a23e0
FindZeroMq
2019-02-13 14:53:23 +01:00
Samuel Debionne
c064dc84ae
Add generation and install of CMake packages
2019-02-13 10:45:01 +01:00
a64b34610a
merge from developer (without the additional json header implementations)
2019-02-12 09:35:24 +01:00
140996fae6
ctb adc fix, update detector fix, acq error fix
2019-02-06 18:50:50 +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
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
c3472f295b
split client and server interface
2019-01-23 12:07:44 +01:00
Erik Frojdh
99a1c609f1
starting to add new Socket interface
2019-01-23 11:47:13 +01:00
Erik Frojdh
3eca4c0535
typo
2019-01-21 14:44:06 +01:00
Erik Frojdh
b200138730
data types and format
2019-01-21 14:43:24 +01:00
Erik Frojdh
e1ec60c9c1
cleaning up tests for command line parser
2019-01-21 10:45:43 +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
10539f8533
new getDetectorType functions
2019-01-18 10:53:49 +01:00
13f9b9929a
slsreceiver: removed option to start receiver with config file, redundant as the only option is receiver tcp port
2019-01-17 15:17:08 +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
b19b2a044c
minor
2019-01-16 15:22:18 +01:00
Erik Frojdh
1ebe0f5624
spelling
2019-01-16 15:18:49 +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
bc9d5718c9
typo
2019-01-14 15:38:48 +01:00
