27 Commits

Author SHA1 Message Date
Dhanya Maliakal
e915245c10 additional change 2015-10-08 17:09:43 +02:00
Dhanya Maliakal
a3e88f96d6 some more changes 2015-10-08 12:19:07 +02:00
Dhanya Maliakal
c392348def big change half done 2015-09-30 11:40:39 +02:00
Dhanya Maliakal
06b38e591c got rid of warnings 2015-09-23 12:34:21 +02:00
Dhanya Maliakal
7c0430572b included subframe into receiver and sends to gui 2015-09-22 16:21:41 +02:00
Dhanya Maliakal
fe76ce9650 seems to run fine, only 16gb checked for fimware v 10 and software version v1.10.2 2015-09-15 15:31:29 +02:00
Dhanya Maliakal
74366b3cfe halfway into new server 2015-09-03 12:00:37 +02:00
Dhanya Maliakal
9f55e8bfdd merging with master 2015-08-21 14:47:07 +02:00
Dhanya Maliakal
5dd5c250f3 removing unnecessary prints 2015-08-19 14:55:15 +02:00
Dhanya Maliakal
52f83b9249 do not push, debug commands involved 2015-08-10 13:44:57 +02:00
Dhanya Maliakal
ca9f195f0b starting of a new change 2015-07-16 13:33:34 +02:00
Dhanya Maliakal
476d1b452f some changes 2015-07-10 16:04:29 +02:00
Dhanya Maliakal
fbfafb98fd small change 2015-07-03 16:10:04 +02:00
Dhanya Maliakal
c840305189 starting receiver only at set detector type works 2015-05-21 17:39:17 +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
2f82469531 fifo debug with color done 2015-03-05 15:21:12 +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
e975a75be9 some code refraction to get rid of memeory leakage 2015-02-04 16:11:13 +01:00
Dhanya Maliakal
f30833a460 got rid of unnecessary printouts in receiver 2015-01-30 15:03:35 +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
8a63e7e184 added log printouts. Added hardcoded REST configuration 2014-11-05 11:44:00 +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
7986746194 from private to protected 2014-09-15 16:33:57 +02:00
27780d02d8 cleaning the project 2014-09-10 09:19:35 +02:00