detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 15:00:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh 2020-07-23 10:57:47 +02:00
commit 9ea8882c05
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/src/Module.cpp
View File

@ -391,7 +391,7 @@ void Module::setExternalSignalFlags(int signalIndex, externalSignalFlag type) {
void Module::startReceiver() { void Module::startReceiver() {
shm()->stoppedFlag = false; shm()->stoppedFlag = false;
sendToReceiver(F_START_RECEIVER, nullptr, nullptr); sendToReceiver(F_START_RECEIVER);
} }
void Module::stopReceiver() { void Module::stopReceiver() {
@ -932,7 +932,7 @@ void Module::setFileIndex(int64_t file_index) {
} }
void Module::incrementFileIndex() { void Module::incrementFileIndex() {
sendToReceiver(F_INCREMENT_FILE_INDEX, nullptr, nullptr); sendToReceiver(F_INCREMENT_FILE_INDEX);
} }
bool Module::getFileWrite() { bool Module::getFileWrite() {
@ -2273,7 +2273,7 @@ void Module::copyDetectorServer(const std::string &fname,
} }
void Module::rebootController() { void Module::rebootController() {
sendToDetector(F_REBOOT_CONTROLLER, nullptr, nullptr); sendToDetector(F_REBOOT_CONTROLLER);
LOG(logINFO) << "Controller rebooted successfully!"; LOG(logINFO) << "Controller rebooted successfully!";
} }
@ -2673,6 +2673,20 @@ template <typename Ret> Ret Module::sendToReceiver(int fnum) const {
return retval; return retval;
} }
void Module::sendToReceiver(int fnum) {
LOG(logDEBUG1) << "Sending to Receiver: ["
<< getFunctionNameFromEnum(static_cast<detFuncs>(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<detFuncs>(fnum))
<< ", nullptr, 0, nullptr, 0]";
sendToReceiver(fnum, nullptr, 0, nullptr, 0);
}
template <typename Ret, typename Arg> template <typename Ret, typename Arg>
Ret Module::sendToReceiver(int fnum, const Arg &args) { Ret Module::sendToReceiver(int fnum, const Arg &args) {
LOG(logDEBUG1) << "Sending to Receiver: [" LOG(logDEBUG1) << "Sending to Receiver: ["
@ -2803,7 +2817,7 @@ void Module::checkReceiverVersionCompatibility() {
} }
void Module::restreamStopFromReceiver() { void Module::restreamStopFromReceiver() {
sendToReceiver(F_RESTREAM_STOP_FROM_RECEIVER, nullptr, nullptr); sendToReceiver(F_RESTREAM_STOP_FROM_RECEIVER);
} }
int Module::sendModule(sls_detector_module *myMod, sls::ClientSocket &client) { int Module::sendModule(sls_detector_module *myMod, sls::ClientSocket &client) {

4
slsDetectorSoftware/src/Module.h
View File

@ -607,6 +607,10 @@ class Module : public virtual slsDetectorDefs {
template <typename Ret> Ret sendToReceiver(int fnum) const; template <typename Ret> Ret sendToReceiver(int fnum) const;
void sendToReceiver(int fnum);
void sendToReceiver(int fnum) const;
template <typename Ret, typename Arg> template <typename Ret, typename Arg>
Ret sendToReceiver(int fnum, const Arg &args); Ret sendToReceiver(int fnum, const Arg &args);