From f4fa19b559a7ce41d1a947ef4258e6d611422dc9 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 2 Jul 2019 17:29:38 +0200 Subject: [PATCH] bugfix rxr: checkonline prints error msg, call receiverversion instead --- slsDetectorServers/slsDetectorServer/common.h | 2 +- slsDetectorSoftware/src/slsDetector.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorServers/slsDetectorServer/common.h b/slsDetectorServers/slsDetectorServer/common.h index a367b18ff..72932e041 100755 --- a/slsDetectorServers/slsDetectorServer/common.h +++ b/slsDetectorServers/slsDetectorServer/common.h @@ -24,7 +24,7 @@ int ConvertToDifferentRange(int inputMin, int inputMax, int outputMin, int outpu bigger = inputMin; } 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; return FAIL; } diff --git a/slsDetectorSoftware/src/slsDetector.cpp b/slsDetectorSoftware/src/slsDetector.cpp index a8f5afbfc..73aff14c0 100755 --- a/slsDetectorSoftware/src/slsDetector.cpp +++ b/slsDetectorSoftware/src/slsDetector.cpp @@ -3230,7 +3230,7 @@ int slsDetector::getReceiverOnline() const { return shm()->rxOnlineFlag; } std::string slsDetector::checkReceiverOnline() { try { - auto receiver = ReceiverSocket(shm()->rxHostname, shm()->rxTCPPort); + getReceiverSoftwareVersion(); shm()->rxOnlineFlag = ONLINE_FLAG; } catch (...) { shm()->rxOnlineFlag = OFFLINE_FLAG;