172 Commits

Author SHA1 Message Date
Dhanya Maliakal
53cf4a7f67 Merge branch 'master' into partial_frames 2015-08-05 09:12:10 +02:00
Dhanya Maliakal
a26cbced57 corrected 10g mapping for gui 2015-08-05 09:11:50 +02:00
Dhanya Maliakal
e9a301dd97 merge master into partial_Frames, including changes of propix 2015-07-29 10:23:35 +02:00
Dhanya Maliakal
4e52096991 included propix receiver 2015-07-21 16:25:56 +02:00
Dhanya Maliakal
476d1b452f some changes 2015-07-10 16:04:29 +02:00
Dhanya Maliakal
88e96d45e7 getting dr from rxr fixed 2015-06-30 17:21:45 +02:00
Dhanya Maliakal
7e02a9d3d1 resolved flip bytes in eiger 2015-06-26 15:57:28 +02:00
Dhanya Maliakal
4f88e831c4 checks if receiver udp object was created before executing functions and hence always returns a ret 2015-05-26 17:01:42 +02:00
Dhanya Maliakal
c840305189 starting receiver only at set detector type works 2015-05-21 17:39:17 +02:00
992a298abc added dunny implementation as an example to combine TCPIP interface and custom UDP reciever 2015-04-21 15:09:50 +02:00
Dhanya Maliakal
15bbb099d3 for mapping 32 bit eiger 2015-04-14 17:11:56 +02:00
Dhanya Maliakal
6cd28165ca top image reconstruct works with make flga 2015-04-10 17:11:26 +02:00
Dhanya Maliakal
b5e8c104db printouts for eigermapping 2015-03-31 14:45:41 +02:00
Dhanya Maliakal
89ad2112c6 difference between acquisition index and frame index 2015-03-12 12:25:23 +01:00
Dhanya Maliakal
6063c712f7 copy first frame to latest data no matter what and also copy only if more than packets per frame 2015-03-10 15:04:50 +01:00
Dhanya Maliakal
3ee146a2ca moved start of frame to after stoplistening, for eiger to ignore incomplete frames 2015-02-24 16:19:33 +01:00
Dhanya Maliakal
651a13f811 so that gui can reread the same frame from receiver, guidataready is set to zero only once 2015-02-23 15:25:06 +01:00
Dhanya Maliakal
e975a75be9 some code refraction to get rid of memeory leakage 2015-02-04 16:11:13 +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
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