detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +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

34
slsDetectorSoftware/include/Detector.h
View File

@ -340,6 +340,40 @@ class Detector {
*/
void setReceiverPort(int value, Positions pos = {});
/**
* Gets Lock for detector control server to this client IP
* @param pos detector position
* @returns lock
*/
Result<bool> getLockServer(Positions pos = {});
/**
* Sets Lock for detector control server to this client IP
* @param value lock
* @param pos detector position
*/
void setLockServer(bool value, Positions pos = {});
/**
* Get last client IP saved on detector server
* @param pos detector position
* @returns last client IP saved on detector server
*/
Result<std::string> getLastClientIP(Positions pos = {});
/**
* Exit detector server
* @param pos detector position
*/
void exitServer(Positions pos = {});
/**
* Execute a command on the detector server
* @param value command
* @param pos detector position
*/
void execCommand(const std::string &value, Positions pos = {});
// Erik
Result<int> getFramesCaughtByReceiver(Positions pos = {}) const;

8
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -557,27 +557,27 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns 1 for locked or 0 for unlocked
*/
int lockServer(int p = -1, int detPos = -1);
int lockServer(int p = -1, int detPos = -1);//
/**
* Get last client IP saved on detector server
* @param detPos -1 for all detectors in list or specific detector position
* @returns last client IP saved on detector server
*/
std::string getLastClientIP(int detPos = -1);
std::string getLastClientIP(int detPos = -1);//
/**
* Exit detector server
* @param detPos -1 for all detectors in list or specific detector position
*/
void exitServer(int detPos = -1);
void exitServer(int detPos = -1);//
/**
* Execute a command on the detector server
* @param cmd command
* @param detPos -1 for all detectors in list or specific detector position
*/
void execCommand(const std::string &cmd, int detPos);
void execCommand(const std::string &cmd, int detPos);//
/**
* Load configuration from a configuration File

4
slsDetectorSoftware/include/slsDetector.h
View File

@ -484,9 +484,9 @@ class slsDetector : public virtual slsDetectorDefs {
/**
* Lock server for this client IP
* @param p 0 to unlock, 1 to lock (-1 gets)
* @returns 1 for locked or 0 for unlocked
* @returns true for locked or false for unlocked
*/
int lockServer(int lock = -1);
bool lockServer(int lock = -1);
/**
* Get last client IP saved on detector server