detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 22:40:02 +02:00
Code Issues Actions Packages Releases Activity
60 Commits 44 Branches 100 Tags
Commit Graph

8 Commits

Author SHA1 Message Date
Sala Leonardo
f36d742cd3 Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_receiver_software into eiger_receiver 2014-11-17 15:52:43 +01:00
Leonardo Sala
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
Sala Leonardo
546d43dedb Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_receiver_software into eiger_receiver 
Conflicts:
	include/UDPInterface.h
 2014-09-22 14:46:34 +02:00
Leonardo Sala
e5864d4343 Added status resetting for REST 2014-09-22 11:45:01 +02:00
Leonardo Sala
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
Sala Leonardo
50d049539e minor 2014-09-10 10:17:36 +02:00
Sala Leonardo
ce0b32b558 Merge branch 'eiger_receiver' into devel_leo 
Conflicts:
	Makefile
	include/UDPInterface.h
	slsReceiver/Makefile
	slsReceiver/eigerReceiver/eigerReceiver.cpp
	slsReceiver/eigerReceiver/eigerReceiverDummy.cpp
	slsReceiver/eigerReceiver/eigerReceiverTest.cpp
 2014-09-10 10:07:33 +02:00
Sala Leonardo
59fc6fbaf8 moved .h into include. Second round of cleaning 2014-09-10 09:39:11 +02:00