Erik Frojdh
|
af550b4c70
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-30 14:46:19 +01:00 |
|
|
|
70a1b87603
|
merge conflict resolved
|
2018-10-30 14:31:20 +01:00 |
|
|
|
dfa8cf7381
|
runs, prints right in reciever
|
2018-10-30 13:35:20 +01:00 |
|
|
|
92fc837eb4
|
compiles, but doesnt run
|
2018-10-29 15:23:52 +01:00 |
|
|
|
33ac63d14a
|
still updating slsdetector.cpp
|
2018-10-26 17:40:18 +02:00 |
|
|
|
cf87b6ca83
|
still updating slsdetector.cpp
|
2018-10-25 16:24:05 +02:00 |
|
|
|
261849d69c
|
eiger server compiles, client side of interface to do
|
2018-10-23 16:20:40 +02:00 |
|
Erik Frojdh
|
129e12fd97
|
moved test framework
|
2018-10-22 11:21:18 +02:00 |
|
Erik Frojdh
|
ab2eb607c8
|
replced usleep with chrono and thread
|
2018-10-19 15:47:36 +02:00 |
|
Erik Frojdh
|
5671f1c87b
|
using split in add multiple detectors
|
2018-10-19 10:30:31 +02:00 |
|
Erik Frojdh
|
ff440f1325
|
clang-format on multi detector
|
2018-10-19 10:23:06 +02:00 |
|
|
|
dfad145e14
|
still in the process of interfacing det and client
|
2018-10-18 18:08:34 +02:00 |
|
|
|
86fb843021
|
in the process of rewriting detector client interface
|
2018-10-18 10:58:48 +02:00 |
|
Erik Frojdh
|
c95bc84458
|
formatting
|
2018-10-17 18:13:01 +02:00 |
|
Erik Frojdh
|
058de39d40
|
const qualifying
|
2018-10-17 17:51:26 +02:00 |
|
Erik Frojdh
|
b44039361d
|
renamed joinThread getter setter
|
2018-10-17 17:47:19 +02:00 |
|
Erik Frojdh
|
0070a79838
|
removed command threaded
|
2018-10-17 17:35:55 +02:00 |
|
Erik Frojdh
|
1d14dc6ff4
|
void signature of processData
|
2018-10-17 16:58:09 +02:00 |
|
Erik Frojdh
|
1d65063088
|
using std::mutex and std::thread in multi detector
|
2018-10-17 16:56:01 +02:00 |
|
|
|
178b832223
|
funcs name only in c++, bug fix:slsdetectorusers not deleting multislsdetectorcommand object, bug fix: programfpga does not delete fpgasrc malloc if returning in failure
|
2018-10-12 17:37:39 +02:00 |
|
|
|
8df63b7767
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-12 17:03:28 +02:00 |
|
|
|
8382d0f5f9
|
receiver tcp interface updated
|
2018-10-12 17:03:19 +02:00 |
|
Erik Frojdh
|
1e2ffae690
|
setNetworkParameter dont split strings
|
2018-10-12 11:56:47 +02:00 |
|
Erik Frojdh
|
f6357a667f
|
setSettingsDir works as the other functions
|
2018-10-12 11:39:11 +02:00 |
|
Erik Frojdh
|
4cdd766a8e
|
cleaning readConfigFile
|
2018-10-12 09:57:46 +02:00 |
|
Erik Frojdh
|
c3289a973f
|
cleaned up read config file slightly
|
2018-10-11 17:45:57 +02:00 |
|
Erik Frojdh
|
e921dbb6a7
|
minor
|
2018-10-11 16:46:34 +02:00 |
|
Erik Frojdh
|
1895ee1ebe
|
minor
|
2018-10-11 16:19:44 +02:00 |
|
Erik Frojdh
|
22e8c52bd8
|
more style
|
2018-10-11 16:08:02 +02:00 |
|
Erik Frojdh
|
795e147e7d
|
stylistic cleanup
|
2018-10-11 15:52:39 +02:00 |
|
Erik Frojdh
|
f806759af3
|
const string&
|
2018-10-11 15:25:29 +02:00 |
|
Erik Frojdh
|
316ba01297
|
size of writeConfigFile
|
2018-10-11 15:19:26 +02:00 |
|
Erik Frojdh
|
a28932bb6c
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-11 14:43:47 +02:00 |
|
Erik Frojdh
|
4d69b6d3a1
|
added address sanitizer for debug mode
|
2018-10-11 14:43:32 +02:00 |
|
|
|
ee20932392
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-11 14:20:58 +02:00 |
|
|
|
0ee7f67965
|
detector servers moved out of slsdetector software, eiger server compiles with new headers
|
2018-10-11 14:20:50 +02:00 |
|
|
|
c24a9b223c
|
combined all the funcs into one, servers need to be recompiled
|
2018-10-11 13:57:47 +02:00 |
|
Erik Frojdh
|
f7809bda3b
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-11 13:54:37 +02:00 |
|
Erik Frojdh
|
5682466356
|
remove pointers and try block from get detector type
|
2018-10-11 13:54:25 +02:00 |
|
|
|
b82fca2c8e
|
removed warnings
|
2018-10-11 13:32:24 +02:00 |
|
|
|
576de404d4
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-11 12:25:27 +02:00 |
|
|
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +02:00 |
|
Erik Frojdh
|
f735c86b93
|
removing more pointers
|
2018-10-11 12:14:46 +02:00 |
|
Erik Frojdh
|
6aa0029580
|
changing pointers to local variables
|
2018-10-11 12:08:07 +02:00 |
|
Erik Frojdh
|
2216574d34
|
check empty instead of strcmp
|
2018-10-11 11:51:54 +02:00 |
|
|
|
d0950ba001
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2018-10-10 18:11:23 +02:00 |
|
|
|
f69e9d0df4
|
refactored client interface (client ot receiveR)
|
2018-10-10 18:09:14 +02:00 |
|
Erik Frojdh
|
8dc0d72028
|
minor formatting
|
2018-10-10 17:46:28 +02:00 |
|
Erik Frojdh
|
5f6f276f70
|
moved initDetectorStructure into initSharedMemory
|
2018-10-10 17:41:13 +02:00 |
|
Erik Frojdh
|
fd7060ef6c
|
removed pointer to shared memory in some multi functions
|
2018-10-10 14:18:47 +02:00 |
|
