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

servers: updated fw-sw api version check error message, m3 and g2: updated min fw version

Browse Source
This commit is contained in:
maliakal_d 2020-10-02 11:17:11 +02:00
parent 855ed36db2
commit 91efecd4ca
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -164,10 +164,10 @@ void basictests() {
// check for API compatibility - old server // check for API compatibility - old server
if (sw_fw_apiversion > REQRD_FRMWR_VRSN) { if (sw_fw_apiversion > REQRD_FRMWR_VRSN) {
sprintf(initErrorMessage, sprintf(initErrorMessage,
"This detector software software version (0x%llx) is " "This firmware-software api version (0x%llx) is incompatible "
"incompatible.\n" "with the software's minimum required firmware version "
"Please update detector software (min. 0x%llx) to be " "(0x%llx).\nPlease update detector software to be compatible "
"compatible with this firmware.\n", "with this firmware.\n",
(long long int)sw_fw_apiversion, (long long int)sw_fw_apiversion,
(long long int)REQRD_FRMWR_VRSN); (long long int)REQRD_FRMWR_VRSN);
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));

10
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -156,11 +156,11 @@ void basictests() {
// check for API compatibility - old server // check for API compatibility - old server
if (sw_fw_apiversion > REQUIRED_FIRMWARE_VERSION) { if (sw_fw_apiversion > REQUIRED_FIRMWARE_VERSION) {
sprintf( sprintf(initErrorMessage,
initErrorMessage, "This firmware-software api version (0x%llx) is incompatible "
"This detector software software version (%lld) is incompatible.\n" "with the software's minimum required firmware version "
"Please update detector software (min. %lld) to be compatible with " "(0x%llx).\nPlease update detector software to be compatible "
"this firmware.\n", "with this firmware.\n",
(long long int)sw_fw_apiversion, (long long int)sw_fw_apiversion,
(long long int)REQUIRED_FIRMWARE_VERSION); (long long int)REQUIRED_FIRMWARE_VERSION);
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));

8
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -152,10 +152,10 @@ void basictests() {
// check for API compatibility - old server // check for API compatibility - old server
if (sw_fw_apiversion > requiredFirmwareVersion) { if (sw_fw_apiversion > requiredFirmwareVersion) {
sprintf(initErrorMessage, sprintf(initErrorMessage,
"This detector software software version (0x%llx) is " "This firmware-software api version (0x%llx) is incompatible "
"incompatible.\n" "with the software's minimum required firmware version "
"Please update detector software (min. 0x%llx) to be " "(0x%llx).\nPlease update detector software to be compatible "
"compatible with this firmware.\n", "with this firmware.\n",
(long long int)sw_fw_apiversion, (long long int)sw_fw_apiversion,
(long long int)requiredFirmwareVersion); (long long int)requiredFirmwareVersion);
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));

2
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "sls_detector_defs.h" #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 KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020"
#define CTRL_SRVR_INIT_TIME_US (300 * 1000) #define CTRL_SRVR_INIT_TIME_US (300 * 1000)

8
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -138,10 +138,10 @@ void basictests() {
// check for API compatibility - old server // check for API compatibility - old server
if (sw_fw_apiversion > requiredFirmwareVersion) { if (sw_fw_apiversion > requiredFirmwareVersion) {
sprintf(initErrorMessage, sprintf(initErrorMessage,
"This detector software software version (0x%llx) is " "This firmware-software api version (0x%llx) is incompatible "
"incompatible.\n" "with the software's minimum required firmware version "
"Please update detector software (min. 0x%llx) to be " "(0x%llx).\nPlease update detector software to be compatible "
"compatible with this firmware.\n", "with this firmware.\n",
(long long int)sw_fw_apiversion, (long long int)sw_fw_apiversion,
(long long int)requiredFirmwareVersion); (long long int)requiredFirmwareVersion);
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));

8
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -160,10 +160,10 @@ void basictests() {
// check for API compatibility - old server // check for API compatibility - old server
if (sw_fw_apiversion > REQRD_FRMWR_VRSN) { if (sw_fw_apiversion > REQRD_FRMWR_VRSN) {
sprintf(initErrorMessage, sprintf(initErrorMessage,
"This detector software software version (0x%llx) is " "This firmware-software api version (0x%llx) is incompatible "
"incompatible.\n" "with the software's minimum required firmware version "
"Please update detector software (min. 0x%llx) to be " "(0x%llx).\nPlease update detector software to be compatible "
"compatible with this firmware.\n", "with this firmware.\n",
(long long int)sw_fw_apiversion, (long long int)sw_fw_apiversion,
(long long int)REQRD_FRMWR_VRSN); (long long int)REQRD_FRMWR_VRSN);
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));

8
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -136,10 +136,10 @@ void basictests() {
// check for API compatibility - old server // check for API compatibility - old server
if (sw_fw_apiversion > requiredFirmwareVersion) { if (sw_fw_apiversion > requiredFirmwareVersion) {
sprintf(initErrorMessage, sprintf(initErrorMessage,
"This detector software software version (0x%llx) is " "This firmware-software api version (0x%llx) is incompatible "
"incompatible.\n" "with the software's minimum required firmware version "
"Please update detector software (min. 0x%llx) to be " "(0x%llx).\nPlease update detector software to be compatible "
"compatible with this firmware.\n", "with this firmware.\n",
(long long int)sw_fw_apiversion, (long long int)sw_fw_apiversion,
(long long int)requiredFirmwareVersion); (long long int)requiredFirmwareVersion);
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));

2
slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "sls_detector_defs.h" #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 KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020"
#define CTRL_SRVR_INIT_TIME_US (300 * 1000) #define CTRL_SRVR_INIT_TIME_US (300 * 1000)