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
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
59fc6fbaf8
moved .h into include. Second round of cleaning
2014-09-10 09:39:11 +02:00
