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

bugfix rxr: checkonline prints error msg, call receiverversion instead

Browse Source
This commit is contained in:
maliakal_d
2019-07-02 17:29:38 +02:00
parent e16b857ba2
commit f4fa19b559
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/slsDetectorServer/common.h
View File

@ -24,7 +24,7 @@ int ConvertToDifferentRange(int inputMin, int inputMax, int outputMin, int outpu
bigger = inputMin; bigger = inputMin;
} }
if ((inputValue < smaller) || (inputValue > bigger)) { if ((inputValue < smaller) || (inputValue > bigger)) {
FILE_LOG(logERROR, ("Input Value is outside bounds (%d to %d): %d\n", inputValue, smaller, bigger)); FILE_LOG(logERROR, ("Input Value is outside bounds (%d to %d): %d\n", smaller, bigger, inputValue));
*outputValue = -1; *outputValue = -1;
return FAIL; return FAIL;
} }

2
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -3230,7 +3230,7 @@ int slsDetector::getReceiverOnline() const { return shm()->rxOnlineFlag; }
std::string slsDetector::checkReceiverOnline() { std::string slsDetector::checkReceiverOnline() {
try { try {
auto receiver = ReceiverSocket(shm()->rxHostname, shm()->rxTCPPort); getReceiverSoftwareVersion();
shm()->rxOnlineFlag = ONLINE_FLAG; shm()->rxOnlineFlag = ONLINE_FLAG;
} catch (...) { } catch (...) {
shm()->rxOnlineFlag = OFFLINE_FLAG; shm()->rxOnlineFlag = OFFLINE_FLAG;