From 91efecd4cafad19f44ab64772479123549e30d74 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 2 Oct 2020 11:17:11 +0200 Subject: [PATCH] servers: updated fw-sw api version check error message, m3 and g2: updated min fw version --- .../ctbDetectorServer/slsDetectorFunctionList.c | 8 ++++---- .../eigerDetectorServer/slsDetectorFunctionList.c | 14 +++++++------- .../slsDetectorFunctionList.c | 8 ++++---- .../slsDetectorServer_defs.h | 2 +- .../slsDetectorFunctionList.c | 8 ++++---- .../moenchDetectorServer/slsDetectorFunctionList.c | 8 ++++---- .../slsDetectorFunctionList.c | 8 ++++---- .../mythen3DetectorServer/slsDetectorServer_defs.h | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 5d5d88428..869fdd023 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -164,10 +164,10 @@ void basictests() { // check for API compatibility - old server if (sw_fw_apiversion > REQRD_FRMWR_VRSN) { sprintf(initErrorMessage, - "This detector software software version (0x%llx) is " - "incompatible.\n" - "Please update detector software (min. 0x%llx) to be " - "compatible with this firmware.\n", + "This firmware-software api version (0x%llx) is incompatible " + "with the software's minimum required firmware version " + "(0x%llx).\nPlease update detector software to be compatible " + "with this firmware.\n", (long long int)sw_fw_apiversion, (long long int)REQRD_FRMWR_VRSN); LOG(logERROR, (initErrorMessage)); diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index 938e72db8..f1e0cb6a0 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -156,13 +156,13 @@ void basictests() { // check for API compatibility - old server if (sw_fw_apiversion > REQUIRED_FIRMWARE_VERSION) { - sprintf( - initErrorMessage, - "This detector software software version (%lld) is incompatible.\n" - "Please update detector software (min. %lld) to be compatible with " - "this firmware.\n", - (long long int)sw_fw_apiversion, - (long long int)REQUIRED_FIRMWARE_VERSION); + sprintf(initErrorMessage, + "This firmware-software api version (0x%llx) is incompatible " + "with the software's minimum required firmware version " + "(0x%llx).\nPlease update detector software to be compatible " + "with this firmware.\n", + (long long int)sw_fw_apiversion, + (long long int)REQUIRED_FIRMWARE_VERSION); LOG(logERROR, (initErrorMessage)); initError = FAIL; return; diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index 809d319b5..168d766b5 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -152,10 +152,10 @@ void basictests() { // check for API compatibility - old server if (sw_fw_apiversion > requiredFirmwareVersion) { sprintf(initErrorMessage, - "This detector software software version (0x%llx) is " - "incompatible.\n" - "Please update detector software (min. 0x%llx) to be " - "compatible with this firmware.\n", + "This firmware-software api version (0x%llx) is incompatible " + "with the software's minimum required firmware version " + "(0x%llx).\nPlease update detector software to be compatible " + "with this firmware.\n", (long long int)sw_fw_apiversion, (long long int)requiredFirmwareVersion); LOG(logERROR, (initErrorMessage)); diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index 8c3127f90..d78bf98cc 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -1,7 +1,7 @@ #pragma once #include "sls_detector_defs.h" -#define REQRD_FRMWRE_VRSN (0x200707) +#define REQRD_FRMWRE_VRSN (0x200925) #define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020" #define CTRL_SRVR_INIT_TIME_US (300 * 1000) diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 4e2a50410..c33635f4f 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -138,10 +138,10 @@ void basictests() { // check for API compatibility - old server if (sw_fw_apiversion > requiredFirmwareVersion) { sprintf(initErrorMessage, - "This detector software software version (0x%llx) is " - "incompatible.\n" - "Please update detector software (min. 0x%llx) to be " - "compatible with this firmware.\n", + "This firmware-software api version (0x%llx) is incompatible " + "with the software's minimum required firmware version " + "(0x%llx).\nPlease update detector software to be compatible " + "with this firmware.\n", (long long int)sw_fw_apiversion, (long long int)requiredFirmwareVersion); LOG(logERROR, (initErrorMessage)); diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index ae8360d75..f3644e0d8 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -160,10 +160,10 @@ void basictests() { // check for API compatibility - old server if (sw_fw_apiversion > REQRD_FRMWR_VRSN) { sprintf(initErrorMessage, - "This detector software software version (0x%llx) is " - "incompatible.\n" - "Please update detector software (min. 0x%llx) to be " - "compatible with this firmware.\n", + "This firmware-software api version (0x%llx) is incompatible " + "with the software's minimum required firmware version " + "(0x%llx).\nPlease update detector software to be compatible " + "with this firmware.\n", (long long int)sw_fw_apiversion, (long long int)REQRD_FRMWR_VRSN); LOG(logERROR, (initErrorMessage)); diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index 7025d1ecc..8598b8cb2 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -136,10 +136,10 @@ void basictests() { // check for API compatibility - old server if (sw_fw_apiversion > requiredFirmwareVersion) { sprintf(initErrorMessage, - "This detector software software version (0x%llx) is " - "incompatible.\n" - "Please update detector software (min. 0x%llx) to be " - "compatible with this firmware.\n", + "This firmware-software api version (0x%llx) is incompatible " + "with the software's minimum required firmware version " + "(0x%llx).\nPlease update detector software to be compatible " + "with this firmware.\n", (long long int)sw_fw_apiversion, (long long int)requiredFirmwareVersion); LOG(logERROR, (initErrorMessage)); diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index fdd247327..b2811657b 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -1,7 +1,7 @@ #pragma once #include "sls_detector_defs.h" -#define REQRD_FRMWRE_VRSN 0x190000 +#define REQRD_FRMWRE_VRSN (0x200925) #define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020" #define CTRL_SRVR_INIT_TIME_US (300 * 1000)