20 Commits

Author SHA1 Message Date
f113b1afbb Added status stopped 2016-02-22 15:07:05 +01:00
Dhanya Maliakal
6498292ee4 max packets per file forgotten at 5 2015-11-27 17:09:33 +01:00
Dhanya Maliakal
74b1baa9d8 solved packet loss problem 2015-11-27 17:07:57 +01:00
Dhanya Maliakal
3b0e2e611c jungfrau works 2015-11-27 15:57:19 +01:00
Dhanya Maliakal
f77b78b5c6 changes to compile server in defs file 2015-11-02 15:55:15 +01:00
l_msdetect
58bfa296be done 2015-10-28 17:40:55 +01:00
Dhanya Maliakal
a3e12e7955 somewhere 2015-10-15 12:11:06 +02:00
Dhanya Maliakal
a3e88f96d6 some more changes 2015-10-08 12:19:07 +02:00
Dhanya Maliakal
4dba6d746d Merge branch 'master' into partial_frames 2015-09-10 13:08:01 +02:00
Dhanya Maliakal
04578f7c69 added subframe exposure time settable 2015-09-03 15:17:31 +02:00
Dhanya Maliakal
e9a301dd97 merge master into partial_Frames, including changes of propix 2015-07-29 10:23:35 +02:00
Dhanya Maliakal
fa156f337e sorta done without missing packet identifiers 2015-07-28 18:15:09 +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
cd67991357 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-03-06 10:43:22 +01:00
c7aea8f2a6 Some changes for the JCTB software 2015-03-06 10:43:05 +01:00
Dhanya Maliakal
2f82469531 fifo debug with color done 2015-03-05 15:21:12 +01:00
1d5580b0d4 JMCB max frames 2014-11-25 11:54:54 +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
27780d02d8 cleaning the project 2014-09-10 09:19:35 +02:00