Commit Graph

2307 Commits

Author SHA1 Message Date
f161d68efc fix in ltc, added moench, separated servers, left to do max1932, client side for moench and more detailed in ctb server side 2018-12-19 16:38:18 +01:00
Erik Frojdh
1ca8bf204a added string_utils and strcpy_safe 2018-12-19 15:44:21 +01:00
Erik Frojdh
89d9204e1c changed fd and some unused store 2018-12-19 12:24:02 +01:00
Erik Frojdh
88b9a93b3e fixed 2018-12-19 11:51:42 +01:00
Erik Frojdh
1af2d95462 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-12-19 11:45:24 +01:00
Erik Frojdh
d07f53cd6f removed using namespace std in slsDetectorCommand.cpp 2018-12-19 11:31:49 +01:00
6533a474d1 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-12-18 18:07:27 +01:00
Erik Frojdh
2dd8093905 added project to CMakeLists and path for installing 2018-12-17 14:55:19 +01:00
79693a38f5 in between 2018-12-12 11:20:27 +01:00
8f3f9caf2b almost done with ctb update, need to do slow adcs, split to moench and ctb 2018-11-30 10:39:26 +01:00
c19c787904 adcreg command line print 2018-11-12 15:14:37 +01:00
8942098a90 gotthard works, data to be authenticated when personnel available 2018-11-09 15:25:26 +01:00
89fa30ee4b client compiles 2018-11-08 18:10:03 +01:00
91dd176a0f gotthard server done editing 2018-11-08 17:15:48 +01:00
a99584a0da removed ndac from sls_detector_module and from the servers (not used), fixed setting module by eiger bug in sending number of channels 2018-11-02 17:08:25 +01:00
742d4e6cb7 bug fix for mac addr format check 2018-11-02 14:13:59 +01:00
d55c39ef08 minor print fixe 2018-11-02 14:09:40 +01:00
a47db85350 gappixels only for eiger in receiver 2018-11-02 13:56:59 +01:00
b43be57b6e jungfrau server works 2018-11-02 13:50:00 +01:00
aec8c031de kept the same client interface:tb changed when fixing error codes/exceptions, modified multi print, fixed roi bug in indexing to sls 2018-10-31 14:30:30 +01:00
Erik Frojdh
3d40d5d058 format 2018-10-30 14:57:30 +01:00
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