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

moved updateDetector/Receiver

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-25 19:12:28 +01:00
parent 82ce6b639c
commit f1d055138c
5 changed files with 436 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -763,12 +763,30 @@ std::string multiSlsDetector::checkOnline(int detPos) {
return sls::concatenateNonEmptyStrings(r);
}
int multiSlsDetector::setPort(portType t, int num, int detPos) {
int multiSlsDetector::setControlPort(int port_number, int detPos) {
if (detPos >= 0) {
return detectors[detPos]->setPort(t, num);
return detectors[detPos]->setControlPort(port_number);
}
auto r = serialCall(&slsDetector::setPort, t, num);
auto r = serialCall(&slsDetector::setControlPort, port_number);
return sls::minusOneIfDifferent(r);
}
int multiSlsDetector::setStopPort(int port_number, int detPos) {
if (detPos >= 0) {
return detectors[detPos]->setStopPort(port_number);
}
auto r = serialCall(&slsDetector::setStopPort, port_number);
return sls::minusOneIfDifferent(r);
}
int multiSlsDetector::setReceiverPort(int port_number, int detPos) {
if (detPos >= 0) {
return detectors[detPos]->setReceiverPort(port_number);
}
auto r = serialCall(&slsDetector::setReceiverPort, port_number);
return sls::minusOneIfDifferent(r);
}

25
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -418,13 +418,30 @@ class multiSlsDetector : public virtual slsDetectorDefs,
std::string checkOnline(int detPos = -1);
/**
* Set/Gets TCP Port of detector or receiver
* @param t port type
* @param num port number (-1 gets)
* Set/Gets TCP Port of the detector
* @param port_number (-1 gets)
* @param detPos -1 for all detectors in list or specific detector position
* @returns port number
*/
int setPort(portType t, int num = -1, int detPos = -1);
int setControlPort(int port_number = -1, int detPos = -1);
/**
* Set/Gets TCP STOP Port of the detector
* @param port_number (-1 gets)
* @param detPos -1 for all detectors in list or specific detector position
* @returns port number
*/
int setStopPort(int port_number = -1, int detPos = -1);
/**
* Set/Gets TCP Port of the receiver
* @param port_number (-1 gets)
* @param detPos -1 for all detectors in list or specific detector position
* @returns port number
*/
int setReceiverPort(int port_number = -1, int detPos = -1);
/**
* Lock server for this client IP