From 8b9a69e1f141e7db7cb180fed6647bd7aa2bd8d6 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 23 Jul 2020 08:07:36 +0200 Subject: [PATCH] overload for rx void return type --- slsDetectorSoftware/src/Module.cpp | 16 +++++++++++++++- slsDetectorSoftware/src/Module.h | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 12dfd9c8a..50f43c85b 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -391,7 +391,7 @@ void Module::setExternalSignalFlags(int signalIndex, externalSignalFlag type) { void Module::startReceiver() { shm()->stoppedFlag = false; - sendToReceiver(F_START_RECEIVER, nullptr, nullptr); + sendToReceiver(F_START_RECEIVER); } void Module::stopReceiver() { @@ -2673,6 +2673,20 @@ template Ret Module::sendToReceiver(int fnum) const { return retval; } +void Module::sendToReceiver(int fnum) { + LOG(logDEBUG1) << "Sending to Receiver: [" + << getFunctionNameFromEnum(static_cast(fnum)) + << ", nullptr, 0, nullptr, 0]"; + sendToReceiver(fnum, nullptr, 0, nullptr, 0); +} + +void Module::sendToReceiver(int fnum) const { + LOG(logDEBUG1) << "Sending to Receiver: [" + << getFunctionNameFromEnum(static_cast(fnum)) + << ", nullptr, 0, nullptr, 0]"; + sendToReceiver(fnum, nullptr, 0, nullptr, 0); +} + template Ret Module::sendToReceiver(int fnum, const Arg &args) { LOG(logDEBUG1) << "Sending to Receiver: [" diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h index bd8046d45..e39ffc2e5 100644 --- a/slsDetectorSoftware/src/Module.h +++ b/slsDetectorSoftware/src/Module.h @@ -607,6 +607,10 @@ class Module : public virtual slsDetectorDefs { template Ret sendToReceiver(int fnum) const; + void sendToReceiver(int fnum); + + void sendToReceiver(int fnum) const; + template Ret sendToReceiver(int fnum, const Arg &args);