Erik Frojdh
0972b803dd
Merge branch 'developer' into mysocket
2019-05-27 09:12:10 +02:00
7b817fa194
Merge branch 'developer' into jungfrauv0.8
2019-05-17 19:21:01 +02:00
1a1c6b9b42
jungfrau server: feature finish: switching between 2 interfaces
2019-05-17 19:19:03 +02:00
Erik Frojdh
3e5d34647e
updated test for argument parser
2019-05-17 10:00:49 +02:00
Erik Frojdh
591ff53b84
fixed MacAddr 0 output
2019-05-17 09:08:13 +02:00
Erik Frojdh
fff79fbbb6
const char* for command
2019-05-16 16:58:03 +02:00
Erik Frojdh
a11fc31c49
merge
2019-05-16 15:18:14 +02:00
Erik Frojdh
415567006f
non used header
2019-05-16 15:16:11 +02:00
1943e77b24
server interface: ip made to use inet_ntop, mac address and ip to string made common
2019-05-16 15:12:42 +02:00
Erik Frojdh
e6ad80e187
removed cout
2019-05-16 15:10:24 +02:00
Erik Frojdh
615d1b1f33
refactor
2019-05-16 14:27:16 +02:00
9315768159
client bug fix: smaller ips convert to hex
2019-05-16 14:07:58 +02:00
Erik Frojdh
54983c5fd0
removing constexpr
2019-05-16 11:36:25 +02:00
Erik Frojdh
9a8773d9a5
ip test
2019-05-16 11:25:18 +02:00
Erik Frojdh
c6651df1b2
remove mySock
2019-05-16 11:14:03 +02:00
Erik Frojdh
e252b8e0e9
receiver socket
2019-05-15 17:51:48 +02:00
Erik Frojdh
40c2d9f760
try for accept
2019-05-15 12:17:32 +02:00
Erik Fröjdh
877bdb8979
Using FixedCapacityContainer for rxDbitList ( #22 )
...
* fixed capacity container
* changed shm date
2019-05-15 09:16:18 +02:00
Erik Frojdh
bf0847e967
removed ClientInterface
2019-05-15 08:38:49 +02:00
6847175743
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-05-14 18:38:42 +02:00
f90d8c6aff
ctb server: added adcvpp option to get and in mv
2019-05-14 18:38:30 +02:00
45ae8a41ab
updating eiger server
2019-05-14 17:43:34 +02:00
Erik Frojdh
24fc5de58d
clang-tidy header include order
2019-05-14 17:34:51 +02:00
Erik Frojdh
7314c52c63
removed unneccecary includes
2019-05-14 17:32:21 +02:00
Erik Frojdh
bc4d0452af
removed unused error_defs.h
2019-05-14 17:25:43 +02:00
Erik Frojdh
55f482f915
clang-tidy nullptr
2019-05-14 17:11:27 +02:00
741ee3b44c
ctb server bug fix: udp ip not reset before overwriting (smaller size creates problems)
2019-05-14 17:08:07 +02:00
Erik Frojdh
1029ce9705
minor
2019-05-14 14:53:59 +02:00
Erik Frojdh
aff6e30b65
short sleep in socket test
2019-05-14 11:41:39 +02:00
Erik Fröjdh
0224dccd2e
Added noexcept and constexpr ( #21 )
...
* noexcept and constexpr
* check size
2019-05-14 11:08:25 +02:00
Erik Fröjdh
2a1c89f712
Fixed container ( #19 )
...
* added FixedCapacityContainer
* added empty to FixedCapacityContainer
* removed commented out section
* added FixedCapacityContainer to public headers
2019-05-08 12:34:45 +02:00
e14519c236
slsReceiver: removed special receiver config, added rx_dbitlist, rx_dbitoffset to put bits together in file, connected adcinvert, extsamplingsrc and extsampling properly to the detector, added tests
2019-05-03 20:37:40 +02:00
2f3b0e0b06
ctb:separated analog and digital samples in server and send analog and digital data packed separately per frame to reciever
2019-04-30 18:55:32 +02:00
b0cffcd570
master file option, adcdisable changed to adcenable
2019-04-30 12:13:28 +02:00
61a939ef53
ctb: removed setroi, instead using adcenablemask
2019-04-26 16:53:23 +02:00
Erik Frojdh
b853bd92c8
template for sending to detector
2019-04-25 17:01:04 +02:00
Erik Frojdh
4da85b15a0
cleaning
2019-04-25 13:55:45 +02:00
Erik Frojdh
77d34d5b6e
fix
2019-04-25 08:24:56 +02:00
Erik Frojdh
6472cc4dd7
test for socket
2019-04-24 21:30:04 +02:00
eac992ee03
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-04-23 14:35:20 +02:00
4e3baf41cb
ctb server: introducing 1 us delay between rd strobe and fifo read due to different clocks
2019-04-23 14:35:07 +02:00
Erik Frojdh
72091f47d9
format and mod constructor
2019-04-23 10:48:31 +02:00
3d40fb2d2c
ctb address check, integration test added for ctb pattern
2019-04-18 17:18:01 +02:00
45884a72da
eiger binary updated
2019-04-18 15:35:36 +02:00
266520741a
ctb patterns interface rewritten
2019-04-18 15:29:43 +02:00
Erik Frojdh
f591adccb8
added getPatternLoop
2019-04-18 09:33:14 +02:00
Erik Frojdh
ee20cfab1e
removed pointers added constructor
2019-04-17 16:19:18 +02:00
Erik Frojdh
b46e107f35
moved detParameters to sls_detector_defs
2019-04-17 14:28:53 +02:00
Erik Frojdh
91813a2c68
moved sls_detector_module outside slsDetectorDefs class
2019-04-17 09:27:45 +02:00
79c6f5310b
eiger server and client: cleaning up setting of dynamic range for eiger, where multi client takes care of checking rate correction in a separate call, tests included
2019-04-12 19:20:31 +02:00
