detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 00:07:13 +02:00
Code Issues Actions Packages Releases Activity

fixed merge

Browse Source
This commit is contained in:
Erik Frojdh
2019-08-08 17:14:54 +02:00
parent d1d730b779 b73b98ce3f
commit 869eee4d98
5 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/src/Detector.cpp
View File

@ -254,6 +254,26 @@ void Detector::setReceiverPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setReceiverPort, pos, value);
}
Result<bool> Detector::getLockServer(Positions pos) {
return pimpl->Parallel(&slsDetector::lockServer, pos, -1);
}
void Detector::setLockServer(bool value, Positions pos) {
pimpl->Parallel(&slsDetector::lockServer, pos, static_cast<int>(value));
}
Result<std::string> Detector::getLastClientIP(Positions pos) {
return pimpl->Parallel(&slsDetector::getLastClientIP, pos);
}
void Detector::exitServer(Positions pos) {
pimpl->Parallel(&slsDetector::exitServer, pos);
}
void Detector::execCommand(const std::string &value, Positions pos) {
pimpl->Parallel(&slsDetector::execCommand, pos, value);
}
// Erik
Result<int> Detector::getFramesCaughtByReceiver(Positions pos) const {
return pimpl->Parallel(&slsDetector::getFramesCaughtByReceiver, pos);

4
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -761,12 +761,12 @@ int slsDetector::getControlPort() const { return shm()->controlPort; }
int slsDetector::getStopPort() const { return shm()->stopPort; }
int slsDetector::lockServer(int lock) {
bool slsDetector::lockServer(int lock) {
int retval = -1;
FILE_LOG(logDEBUG1) << "Setting detector server lock to " << lock;
sendToDetector(F_LOCK_SERVER, lock, retval);
FILE_LOG(logDEBUG1) << "Lock: " << retval;
return retval;
return (retval == 1 ? true : false);
}
std::string slsDetector::getLastClientIP() {