57 Commits

Author SHA1 Message Date
Erik Frojdh
d46d96ecca fixed linking zmq 2019-02-13 15:35:40 +01:00
a64b34610a merge from developer (without the additional json header implementations) 2019-02-12 09:35:24 +01:00
Erik Frojdh
49f71ffca7 project wide nullptr fix 2019-01-16 15:15:29 +01:00
b43be57b6e jungfrau server works 2018-11-02 13:50:00 +01:00
dfa8cf7381 runs, prints right in reciever 2018-10-30 13:35:20 +01:00
5a356534e6 refactor receiver client interface, moved defs into one sls_detector_defs.h 2018-10-11 12:25:18 +02:00
8151f1d5fe receiver compiles 2018-10-09 18:02:47 +02:00
f7a6938366 client moved everythign from common files to slsSupportLin/include 2018-10-08 10:45:56 +02:00
100c1b81f8 moved all the common header files from receiverSoftware to commonFiles 2018-10-02 16:32:37 +02:00
c2db073d5e receiver and client: changed xcoord to row and ycoord to column, zcoord to reserved 2018-09-26 15:03:04 +02:00
14c899e7cf removed some manual warnings 2018-08-24 12:34:06 +02:00
e0b8fb3609 updated manuals, jungfrau server (reqd firmware vversion) 2018-08-23 15:52:12 +02:00
5b6ec303d7 manual api mainclient fix for enum FAIL 2018-08-23 13:00:49 +02:00
63c130a380 client:updated users class and release.txt 2018-08-22 18:08:35 +02:00
7945d15beb client: updating release.txt, updating command line help, catching slsDetectorUsers exception from multislsdetector constructor 2018-08-21 18:49:29 +02:00
147194e8af slsDetector: connect stop socket in checkonline so that it does not stick to its initialized default file descriptor zero (which gets closed upon socket deletion) 2018-08-03 14:54:32 +02:00
e38e500e16 manual example api: fixed the makefile include 2018-07-30 18:36:49 +02:00
41fb6c26a2 slsDetectorSoftware: from 3.1.4: being able to get timer values individually from the users class since gotthard 25um master and slave will have different delay values 2018-07-30 17:47:37 +02:00
40c96b5562 Updated Makefiles, Cmakelists.txt to compile slsMultiReceiver properly and with HDF5 and fixed compiler warnings 2018-07-18 12:29:19 +02:00
9af0ec74b6 slsReceiver: updated help in slsMultiReceiver 2018-07-06 16:32:42 +02:00
45de361b22 slsReceiver: added an executable slsMultiReceiver to have the option to have one process create multiple child processes for multiple receivers with configurable tcp port and callback enable 2018-07-06 16:26:29 +02:00
14546247e4 adding a receiver callback to be able to give modified size from the callback 2018-03-22 14:34:03 +01:00
a74e8f68f7 size change in receiver call back API now streamed, gui allows smaller packet size than expected to be caught and replaced the rest with 0xFF 2018-03-21 17:08:38 +01:00
Dhanya Maliakal
65a91c519e Merge branch '3.0.1' into developer 2017-12-14 14:29:16 +01:00
Dhanya Maliakal
0649626842 made the color fix for black/white backgrounds 2017-12-14 14:29:07 +01:00
Dhanya Maliakal
130f3d2e6f Merge branch '3.0.1' into developer 2017-11-28 11:18:43 +01:00
Dhanya Maliakal
4825ace129 switching from black to white background for receiver 2017-11-28 11:18:22 +01:00
Dhanya Maliakal
ab93835ce2 merge conflict to include datastreaming in client comment 2017-11-23 10:29:08 +01:00
Dhanya Maliakal
3b292bdeb6 need to enable data streaming for client 2017-11-23 10:27:59 +01:00
Dhanya Maliakal
43140811bd one measurement in users class 2017-11-23 10:25:35 +01:00
Dhanya Maliakal
29f3387d73 Merge branch '3.0.1' into developer 2017-11-23 09:34:22 +01:00
Dhanya Maliakal
4749e8c4e4 modified users client to work without config and better print out 2017-11-23 09:34:12 +01:00
Dhanya Maliakal
a1d325a115 Merge branch '3.0.1' into developer 2017-11-23 09:20:22 +01:00
Dhanya Maliakal
3034cf87d0 changes that might be reverted in detser 2017-11-23 09:20:20 +01:00
Dhanya Maliakal
447451231c modified users client to work without config and better print out 2017-11-22 18:09:16 +01:00
Dhanya Maliakal
c0bfe46aa1 enabling client in developer user api 2017-11-22 18:00:41 +01:00
Dhanya Maliakal
ea3c722552 made a bin in manual api to be able to compile here 2017-11-22 17:47:16 +01:00
Dhanya Maliakal
d47abb140f removed detreceivernocall 2017-11-22 17:43:00 +01:00
Dhanya Maliakal
f4f03f659a color code in user example depending on modID, instead of xcoord 2017-10-23 17:07:45 +02:00
Dhanya Maliakal
65fd5a3057 merged without call back and call back into one user example 2017-10-23 15:26:04 +02:00
Dhanya Maliakal
6b6ad6efe0 added one without call back 2017-09-19 16:47:56 +02:00
Dhanya Maliakal
ae066fab93 modified userReceiver to make it work 2017-09-19 16:33:05 +02:00
Dhanya Maliakal
35dcdd62c9 links to libraries in manual 2017-08-28 14:15:57 +02:00
Dhanya Maliakal
ce0aa98b3f updated users documentation 2017-08-25 15:42:56 +02:00
Dhanya Maliakal
6d2072f198 removed unnecessary print in makefile for manual 2017-08-24 18:41:56 +02:00
Dhanya Maliakal
319d883880 modified user example in manual/manual-api and regenerated documentation 2017-08-24 16:47:27 +02:00
Dhanya Maliakal
760ca98ee4 updating user documentation. another update required 2017-08-22 19:40:20 +02:00
Dhanya Maliakal
78d1504d66 changed all -lpthread to -pthread 2017-05-01 09:39:19 +02:00
Maliakal Dhanya
4677f19437 separate receiver, and updated docs 2014-05-26 17:07:55 +02:00
Maliakal Dhanya
1f2c98b0fa included the stop for receiver users, and the start returns 2014-05-23 18:24:52 +02:00