65 Commits

Author SHA1 Message Date
Erik Frojdh
f9417a23e0 FindZeroMq 2019-02-13 14:53:23 +01:00
a64b34610a merge from developer (without the additional json header implementations) 2019-02-12 09:35:24 +01:00
076faa62e0 ctb server: server starts up good. Need to debug each function in detail 2019-02-06 15:50:44 +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
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
1ebe0f5624 spelling 2019-01-16 15:18:49 +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
Erik Frojdh
991567ba1c strcpy and cleanup of configuremac 2019-01-14 15:33:35 +01:00
Erik Frojdh
172c9218d1 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-01-11 16:56:43 +01:00
Erik Frojdh
b7582e93d3 working on removing undefined beaviour in configureMAC 2019-01-11 16:56:31 +01:00
1bbb352743 jungfrau server: pll moved out to remove redundancy 2019-01-11 14:48:58 +01:00
94979b5824 changes to moench 2019-01-11 11:11:50 +01:00
52785c6642 gotthard server works 2019-01-10 10:35:49 +01:00
Erik Frojdh
93ec5f5ef7 minor 2019-01-09 16:22:14 +01:00
Erik Frojdh
b7aac059c3 moved string stuff to string_utils.h/.cpp 2019-01-09 11:19:16 +01:00
bfda07d262 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-12-19 17:16:54 +01:00
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
79693a38f5 in between 2018-12-12 11:20:27 +01:00
a4de4bb475 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-12-04 16:05:17 +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
Erik Frojdh
284ce30a81 starting tests 2018-11-28 14:45:50 +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
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
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
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
014dfaa251 moved to vector of unique pointer in slsReceiverImplementation 2018-10-16 17:30:43 +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
8382d0f5f9 receiver tcp interface updated 2018-10-12 17:03:19 +02:00
d2c8c0a2eb gotthard server, moved communication_funcs to slsDetectorServer 2018-10-11 15:53:30 +02:00