20 Commits

Author SHA1 Message Date
df11f41416 reworked version 2017-08-10 10:04:00 +02:00
d827ccc115 backported changes implemented in 2.3.2.rest 2017-08-08 06:55:52 +02:00
Dhanya Maliakal
0bacb903ea rest implementation, index issues 2017-07-13 14:44:03 +02:00
3c0ce23bc2 fixed hardcoded port number, cleanup 2016-12-02 15:21:22 +00:00
657d3e5759 first functional commit, still some workarounds. Can start, acquire, stop, restart 2016-12-01 15:59:12 +00:00
f61d819599 wip for Eiger9M 2016-12-01 07:43:46 +00:00
Dhanya Maliakal
0d86439589 some cleanup for rest 2015-11-23 11:54:55 +01:00
248848c666 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-03-24 09:49:41 +01:00
1df89d4ce2 test 2015-03-23 11:41:19 +01:00
9e78bae614 solved bad_alloc 2015-03-23 11:18:24 +01:00
Dhanya Maliakal
89ad2112c6 difference between acquisition index and frame index 2015-03-12 12:25:23 +01:00
3324667d05 proper thread handling for the REST receiver 2014-11-12 11:54:48 +01:00
7c51b06777 Merge branch 'master' into eiger_receiver
Conflicts:
	include/slsReceiverTCPIPInterface.h
	slsReceiver/slsReceiver.cpp
	src/UDPStandardImplementation.cpp
	src/slsReceiverTCPIPInterface.cpp

it compiles
2014-11-11 15:54:12 +01:00
3a07f0d785 fixed dr bug 2014-11-07 15:49:06 +01:00
9ec5541b58 removed hardcoded DR and nframes 2014-11-07 14:43:17 +01:00
8a63e7e184 added log printouts. Added hardcoded REST configuration 2014-11-05 11:44:00 +01:00
f05248cd32 fixes 2014-09-22 14:09:31 +02:00
e5864d4343 Added status resetting for REST 2014-09-22 11:45:01 +02:00
b427452f39 able to send data to eigerbe
tweaks on logging

added configuration_map, to flexibly pass options to the different receivers

some more fixes to method overloads

still very preliminary
2014-09-17 15:56:27 +02:00
27780d02d8 cleaning the project 2014-09-10 09:19:35 +02:00