|
659e204b35
|
solved conflicts
|
2019-05-27 15:05:40 +02:00 |
|
|
2c2fb7358c
|
jungfrau board 2 adc defines, full speed limitation for old boards
|
2019-05-27 15:04:13 +02:00 |
|
Erik Frojdh
|
d3646f0ac5
|
pinned conda-build version
|
2019-05-27 14:33:17 +02:00 |
|
Erik Frojdh
|
e4367c9ab1
|
checking for nullptr
|
2019-05-27 14:20:40 +02:00 |
|
Dhanya Thattil
|
54a396065d
|
ctb versioning bug fix
|
2019-05-27 14:08:41 +02:00 |
|
|
7fdab08256
|
ctb receiver fix: extract in 8 bit batches instead of 32 for less padding
|
2019-05-27 11:30:54 +02:00 |
|
Erik Frojdh
|
8ebc0f2644
|
uniqe ptr for receiver
|
2019-05-27 11:28:59 +02:00 |
|
Erik Frojdh
|
0972b803dd
|
Merge branch 'developer' into mysocket
|
2019-05-27 09:12:10 +02:00 |
|
Erik Frojdh
|
e2ef043e04
|
removed old configure file
|
2019-05-24 16:31:25 +02:00 |
|
Erik Frojdh
|
43dc9df6db
|
removed unused scripts
|
2019-05-24 10:25:34 +02:00 |
|
|
10f89599e0
|
bug fix: hdf5 printError still called once. replcaed with printErrorStack
|
2019-05-22 19:11:35 +02:00 |
|
Erik Frojdh
|
452fd1e457
|
new defaults for CMake
|
2019-05-22 09:45:08 +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
|
c30c6bb883
|
fixed uninitialized pointer
|
2019-05-16 15:00:15 +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
|
1db1b0307c
|
init
|
2019-05-16 11:50:35 +02:00 |
|
Erik Frojdh
|
0d98bd0048
|
init
|
2019-05-16 11:43:12 +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
|
f1a1391866
|
Factored out time conversion (#23)
* time conversion
* with comment
* lround in slsDetectorCommand
|
2019-05-15 10:22:38 +02:00 |
|
Erik Frojdh
|
c632badb55
|
Merge branch 'developer' into mysocket
|
2019-05-15 10:10:13 +02:00 |
|
Erik Frojdh
|
8f8d565e4e
|
work
|
2019-05-15 10:09:54 +02:00 |
|
Erik Frojdh
|
f64facee0c
|
Merge branch 'developer' into mysocket
|
2019-05-15 10:02:43 +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
|
9d5848d0d6
|
inprogress
|
2019-05-15 09:12:14 +02:00 |
|
Erik Frojdh
|
bf0847e967
|
removed ClientInterface
|
2019-05-15 08:38:49 +02:00 |
|
|
97dd329a7b
|
client: zmqip bug fix (typo with strlen)
|
2019-05-14 18:57:39 +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
|
97692ae3ab
|
moved from c headers
|
2019-05-14 17:17:21 +02:00 |
|
Erik Frojdh
|
55f482f915
|
clang-tidy nullptr
|
2019-05-14 17:11:27 +02:00 |
|
Erik Frojdh
|
74d67261a9
|
no check for null when deleting
|
2019-05-14 17:09:24 +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
|
29be6f3b34
|
no check for null when deleting
|
2019-05-14 17:07:56 +02:00 |
|