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

user friendly message added from ' dangerous to continue' to 'check firmware' (#665)

Browse Source
This commit is contained in:
Dhanya Thattil 2023-02-20 16:35:33 +01:00 committed by GitHub
parent dde99a16b3
commit adcde9fd49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
serverBin/ctbDetectorServerv7.0.0.rc3
View File

@ -1 +0,0 @@
../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc3

1
serverBin/ctbDetectorServerv7.0.0.rc5 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc5

1
serverBin/gotthard2DetectorServerv7.0.0.rc3
View File

@ -1 +0,0 @@
../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc3

1
serverBin/gotthard2DetectorServerv7.0.0.rc5 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc5

1
serverBin/gotthardDetectorServerv7.0.0.rc3
View File

@ -1 +0,0 @@
../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc3

1
serverBin/gotthardDetectorServerv7.0.0.rc5 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc5

1
serverBin/jungfrauDetectorServerv7.0.0.rc3
View File

@ -1 +0,0 @@
../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc3

1
serverBin/jungfrauDetectorServerv7.0.0.rc5 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc5

1
serverBin/moenchDetectorServerv7.0.0.rc3
View File

@ -1 +0,0 @@
../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc3

1
serverBin/moenchDetectorServerv7.0.0.rc5 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc5

1
serverBin/mythen3DetectorServerv7.0.0.rc3
View File

@ -1 +0,0 @@
../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc3

1
serverBin/mythen3DetectorServerv7.0.0.rc5 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc5

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc3
View File

Binary file not shown.

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc5 Executable file
View File

Binary file not shown.

10
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -99,7 +99,7 @@ void basictests() {
#endif #endif
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Could not map to memory. Dangerous to continue.\n"); "Could not map to memory. Cannot proceed. Check Firmware.\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initError = FAIL; initError = FAIL;
return; return;
@ -109,8 +109,10 @@ void basictests() {
if ((!debugflag) && (!updateFlag) && if ((!debugflag) && (!updateFlag) &&
((checkType() == FAIL) || (testFpga() == FAIL) || ((checkType() == FAIL) || (testFpga() == FAIL) ||
(testBus() == FAIL))) { (testBus() == FAIL))) {
strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. " sprintf(initErrorMessage,
"Dangerous to continue.\n"); "Could not pass basic tests of FPGA and bus. Cannot proceed. "
"Check Firmware. (Firmware version:0x%llx) \n",
getFirmwareVersion());
LOG(logERROR, ("%s\n\n", initErrorMessage)); LOG(logERROR, ("%s\n\n", initErrorMessage));
initError = FAIL; initError = FAIL;
return; return;
@ -446,7 +448,7 @@ void initStopServer() {
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
initError = FAIL; initError = FAIL;
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initCheckDone = 1; initCheckDone = 1;
return; return;

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc3 → slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc5
View File

Binary file not shown.

8
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -93,7 +93,7 @@ void basictests() {
#endif #endif
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Could not map to memory. Dangerous to continue.\n"); "Could not map to memory. Cannot proceed. Check Firmware.\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initError = FAIL; initError = FAIL;
return; return;
@ -105,8 +105,8 @@ void basictests() {
(checkType() == FAIL) || (testFpga() == FAIL) || (checkType() == FAIL) || (testFpga() == FAIL) ||
(testBus() == FAIL))) { (testBus() == FAIL))) {
sprintf(initErrorMessage, sprintf(initErrorMessage,
"Could not pass basic tests of FPGA and bus. Dangerous to " "Could not pass basic tests of FPGA and bus. Cannot proceed. "
"continue. (Firmware version:0x%llx) \n", "Check Firmware. (Firmware version:0x%llx) \n",
getFirmwareVersion()); getFirmwareVersion());
LOG(logERROR, ("%s\n\n", initErrorMessage)); LOG(logERROR, ("%s\n\n", initErrorMessage));
initError = FAIL; initError = FAIL;
@ -396,7 +396,7 @@ void initStopServer() {
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
initError = FAIL; initError = FAIL;
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initCheckDone = 1; initCheckDone = 1;
return; return;

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc3 → slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc5
View File

Binary file not shown.

6
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -87,7 +87,7 @@ void basictests() {
#endif #endif
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Could not map to memory. Dangerous to continue.\n"); "Could not map to memory. Cannot proceed. Check Firmware.\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initError = FAIL; initError = FAIL;
} }
@ -97,7 +97,7 @@ void basictests() {
((checkType() == FAIL) || (testFpga() == FAIL) || ((checkType() == FAIL) || (testFpga() == FAIL) ||
(testBus() == FAIL))) { (testBus() == FAIL))) {
strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. " strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. "
"Dangerous to continue.\n"); "Cannot proceed. Check Firmware.\n");
LOG(logERROR, ("%s\n\n", initErrorMessage)); LOG(logERROR, ("%s\n\n", initErrorMessage));
initError = FAIL; initError = FAIL;
return; return;
@ -381,7 +381,7 @@ void initStopServer() {
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
initError = FAIL; initError = FAIL;
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initCheckDone = 1; initCheckDone = 1;
return; return;

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc5
View File

Binary file not shown.

10
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -82,7 +82,7 @@ void basictests() {
#endif #endif
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Could not map to memory. Dangerous to continue.\n"); "Could not map to memory. Cannot proceed. Check Firmware.\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initError = FAIL; initError = FAIL;
} }
@ -91,8 +91,10 @@ void basictests() {
if ((!debugflag) && (!updateFlag) && if ((!debugflag) && (!updateFlag) &&
((checkType() == FAIL) || (testFpga() == FAIL) || ((checkType() == FAIL) || (testFpga() == FAIL) ||
(testBus() == FAIL))) { (testBus() == FAIL))) {
strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. " sprintf(initErrorMessage,
"Dangerous to continue.\n"); "Could not pass basic tests of FPGA and bus. Cannot proceed. "
"Check Firmware. (Firmware version:0x%llx) \n",
getFirmwareVersion());
LOG(logERROR, ("%s\n\n", initErrorMessage)); LOG(logERROR, ("%s\n\n", initErrorMessage));
initError = FAIL; initError = FAIL;
return; return;
@ -428,7 +430,7 @@ void initStopServer() {
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
initError = FAIL; initError = FAIL;
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initCheckDone = 1; initCheckDone = 1;
return; return;

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc3
View File

Binary file not shown.

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc5 Executable file
View File

Binary file not shown.

10
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -103,7 +103,7 @@ void basictests() {
#endif #endif
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Could not map to memory. Dangerous to continue.\n"); "Could not map to memory. Cannot proceed. Check Firmware.\n");
LOG(logERROR, ("%s\n\n", initErrorMessage)); LOG(logERROR, ("%s\n\n", initErrorMessage));
initError = FAIL; initError = FAIL;
return; return;
@ -113,8 +113,10 @@ void basictests() {
if ((!debugflag) && (!updateFlag) && if ((!debugflag) && (!updateFlag) &&
((checkType() == FAIL) || (testFpga() == FAIL) || ((checkType() == FAIL) || (testFpga() == FAIL) ||
(testBus() == FAIL))) { (testBus() == FAIL))) {
strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. " sprintf(initErrorMessage,
"Dangerous to continue.\n"); "Could not pass basic tests of FPGA and bus. Cannot proceed. "
"Check Firmware. (Firmware version:0x%llx) \n",
getFirmwareVersion());
LOG(logERROR, ("%s\n\n", initErrorMessage)); LOG(logERROR, ("%s\n\n", initErrorMessage));
initError = FAIL; initError = FAIL;
return; return;
@ -451,7 +453,7 @@ void initStopServer() {
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
initError = FAIL; initError = FAIL;
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initCheckDone = 1; initCheckDone = 1;
return; return;

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc3 → slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc5
View File

Binary file not shown.

10
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -89,7 +89,7 @@ void basictests() {
#endif #endif
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Could not map to memory. Dangerous to continue.\n"); "Could not map to memory. Cannot proceed. Check Firmware.\n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initError = FAIL; initError = FAIL;
} }
@ -99,8 +99,10 @@ void basictests() {
((validateKernelVersion(KERNEL_DATE_VRSN) == FAIL) || ((validateKernelVersion(KERNEL_DATE_VRSN) == FAIL) ||
(checkType() == FAIL) || (testFpga() == FAIL) || (checkType() == FAIL) || (testFpga() == FAIL) ||
(testBus() == FAIL))) { (testBus() == FAIL))) {
strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. " sprintf(initErrorMessage,
"Dangerous to continue.\n"); "Could not pass basic tests of FPGA and bus. Cannot proceed. "
"Check Firmware. (Firmware version:0x%llx) \n",
getFirmwareVersion());
LOG(logERROR, ("%s\n\n", initErrorMessage)); LOG(logERROR, ("%s\n\n", initErrorMessage));
initError = FAIL; initError = FAIL;
return; return;
@ -388,7 +390,7 @@ void initStopServer() {
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
initError = FAIL; initError = FAIL;
strcpy(initErrorMessage, strcpy(initErrorMessage,
"Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); "Stop Server: Map Fail. Cannot proceed. Check Firmware. \n");
LOG(logERROR, (initErrorMessage)); LOG(logERROR, (initErrorMessage));
initCheckDone = 1; initCheckDone = 1;
return; return;

12
slsSupportLib/include/sls/versionAPI.h
View File

@ -2,12 +2,12 @@
// Copyright (C) 2021 Contributors to the SLS Detector Package // Copyright (C) 2021 Contributors to the SLS Detector Package
/** API versions */ /** API versions */
#define RELEASE "7.0.0.rc4" #define RELEASE "7.0.0.rc4"
#define APICTB "7.0.0.rc3 0x230130"
#define APIGOTTHARD "7.0.0.rc3 0x230130"
#define APIGOTTHARD2 "7.0.0.rc3 0x230130"
#define APIMYTHEN3 "7.0.0.rc3 0x230130"
#define APIMOENCH "7.0.0.rc3 0x230130"
#define APILIB "7.0.0.rc4 0x230214" #define APILIB "7.0.0.rc4 0x230214"
#define APIRECEIVER "7.0.0.rc4 0x230214" #define APIRECEIVER "7.0.0.rc4 0x230214"
#define APIJUNGFRAU "7.0.0.rc5 0x230216" #define APICTB "7.0.0.rc5 0x230220"
#define APIGOTTHARD "7.0.0.rc5 0x230220"
#define APIGOTTHARD2 "7.0.0.rc5 0x230220"
#define APIJUNGFRAU "7.0.0.rc5 0x230220"
#define APIMYTHEN3 "7.0.0.rc5 0x230220"
#define APIMOENCH "7.0.0.rc5 0x230220"
#define APIEIGER "7.0.0.rc5 0x230220" #define APIEIGER "7.0.0.rc5 0x230220"