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

WIP

Browse Source
This commit is contained in:
maliakal_d
2020-04-17 12:15:16 +02:00
parent df63a6dffe
commit 1d31695cc1
3 changed files with 7 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
slsDetectorSoftware/src/Module.cpp
View File

@ -644,24 +644,6 @@ int Module::setStopPort(int port_number) {
return shm()->stopPort;
}
int Module::setReceiverPort(int port_number) {
LOG(logDEBUG1) << "Setting reciever port to " << port_number;
if (port_number >= 0 && port_number != shm()->rxTCPPort) {
if (shm()->useReceiver) {
int retval = -1;
sendToReceiver(F_SET_RECEIVER_PORT, port_number, retval);
shm()->rxTCPPort = retval;
LOG(logDEBUG1) << "Receiver port: " << retval;
} else {
shm()->rxTCPPort = port_number;
}
}
return shm()->rxTCPPort;
}
int Module::getReceiverPort() const { return shm()->rxTCPPort; }
int Module::getControlPort() const { return shm()->controlPort; }
int Module::getStopPort() const { return shm()->stopPort; }
@ -1498,29 +1480,11 @@ uint32_t Module::clearBit(uint32_t addr, int n) {
void Module::setReceiverHostname(const std::string &receiverIP) {
LOG(logDEBUG1) << "Setting up Receiver with " << receiverIP;
// recieverIP is none
if (receiverIP == "none") {
memset(shm()->rxHostname, 0, MAX_STR_LENGTH);
sls::strcpy_safe(shm()->rxHostname, "none");
shm()->useReceiver = false;
}
// stop acquisition if running
if (getRunStatus() == RUNNING) {
LOG(logWARNING) << "Acquisition already running, Stopping it.";
stopAcquisition();
}
// start updating
std::string host = receiverIP;
auto res = sls::split(host, ':');
if (res.size() > 1) {
host = res[0];
shm()->rxTCPPort = std::stoi(res[1]);
}
sls::strcpy_safe(shm()->rxHostname, host.c_str());
shm()->useReceiver = true;
checkReceiverVersionCompatibility();
// populate parameters from detector
rxParameters retval;