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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-10-28 15:59:18 +01:00
parent 3fdae431b0
commit bc7ebd45df
4 changed files with 50 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
slsDetectorSoftware/include/CmdProxy.h
View File

@ -757,16 +757,18 @@ class CmdProxy {
{"bustest", &CmdProxy::bustest},
/* Insignificant */
{"port", &CmdProxy::port},
{"stopport", &CmdProxy::stopport},
{"lock", &CmdProxy::lock},
{"lastclient", &CmdProxy::lastclient},
{"adcvpp", &CmdProxy::adcvpp},//dac
{"lastclient", &CmdProxy::lastclient},
{"lock", &CmdProxy::lock}
{"adcvpp", &CmdProxy::adcvpp}//dac
};
@ -1333,17 +1335,27 @@ class CmdProxy {
/* Insignificant */
INTEGER_COMMAND(port, getControlPort, setControlPort, std::stoi,
"[n]\n\tPort number of the control server on detector for detector-client tcp interface. Default is 1952. Normally unchanged.");
INTEGER_COMMAND(stopport, getStopPort, setStopPort, std::stoi,
"[n]\n\tPort number of the stop server on detector for detector-client tcp interface. Default is 1953. Normally unchanged.");
INTEGER_COMMAND(lock, getDetectorLock, setDetectorLock, std::stoi,
"[0, 1]\n\tLock detector to one IP, 1: locks");
GET_COMMAND(lastclient, getLastClientIP,
"\n\tClient IP Address that last communicated with the detector.");
DAC_COMMAND(adcvpp, getDAC, setDAC, defs::ADC_VPP,
"[dac or mv value][(optional unit) mv] \n\t[Ctb] Vpp of ADC.\n\t 0 -> 1V ; 1 -> 1.14V ; 2 -> 1.33V ; 3 -> 1.6V ; 4 -> 2V.");
GET_COMMAND(lastclient, getLastClientIP,
"\n\tClient IP Address that last communicated with the detector.");
INTEGER_COMMAND(lock, getDetectorLock, setDetectorLock, std::stoi,
"[0, 1]\n\tLock detector to one IP, 1: locks");

2
slsDetectorSoftware/include/slsDetectorCommand.h
View File

@ -47,7 +47,6 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
static std::string helpUser(int action);
static std::string helpExitServer(int action);
static std::string helpThreaded(int action);
static std::string helpPort(int action);
static std::string helpSettings(int action);
static std::string helpSN(int action);
static std::string helpDigiTest(int action);
@ -68,7 +67,6 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
std::string cmdUser(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdHelp(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdExitServer(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdPort(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdSettings(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdSN(int narg, const char * const args[], int action, int detPos = -1);
std::string cmdDigiTest(int narg, const char * const args[], int action, int detPos = -1);