7 Commits

Author SHA1 Message Date
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
eb0ca1c944 commented overloaded data members 2014-11-07 16:02:28 +01:00
3a07f0d785 fixed dr bug 2014-11-07 15:49:06 +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
59fc6fbaf8 moved .h into include. Second round of cleaning 2014-09-10 09:39:11 +02:00