2eaefaba3a
added log level control
2014-11-18 10:51:52 +01:00
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
3324667d05
proper thread handling for the REST receiver
2014-11-12 11:54:48 +01:00
72bf64ff57
cleaning
2014-11-11 17:02:04 +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
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
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
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
50d049539e
minor
2014-09-10 10:17:36 +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
27780d02d8
cleaning the project
2014-09-10 09:19:35 +02:00
