diff --git a/serverBin/ctbDetectorServerv7.0.0.rc3 b/serverBin/ctbDetectorServerv7.0.0.rc3 deleted file mode 120000 index 186469963..000000000 --- a/serverBin/ctbDetectorServerv7.0.0.rc3 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/ctbDetectorServerv7.0.0.rc5 b/serverBin/ctbDetectorServerv7.0.0.rc5 new file mode 120000 index 000000000..062d8d755 --- /dev/null +++ b/serverBin/ctbDetectorServerv7.0.0.rc5 @@ -0,0 +1 @@ +../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc5 \ No newline at end of file diff --git a/serverBin/gotthard2DetectorServerv7.0.0.rc3 b/serverBin/gotthard2DetectorServerv7.0.0.rc3 deleted file mode 120000 index 854499aee..000000000 --- a/serverBin/gotthard2DetectorServerv7.0.0.rc3 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/gotthard2DetectorServerv7.0.0.rc5 b/serverBin/gotthard2DetectorServerv7.0.0.rc5 new file mode 120000 index 000000000..6520bdb3f --- /dev/null +++ b/serverBin/gotthard2DetectorServerv7.0.0.rc5 @@ -0,0 +1 @@ +../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc5 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServerv7.0.0.rc3 b/serverBin/gotthardDetectorServerv7.0.0.rc3 deleted file mode 120000 index fbcd346c1..000000000 --- a/serverBin/gotthardDetectorServerv7.0.0.rc3 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServerv7.0.0.rc5 b/serverBin/gotthardDetectorServerv7.0.0.rc5 new file mode 120000 index 000000000..6dd5bdbae --- /dev/null +++ b/serverBin/gotthardDetectorServerv7.0.0.rc5 @@ -0,0 +1 @@ +../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc5 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv7.0.0.rc3 b/serverBin/jungfrauDetectorServerv7.0.0.rc3 deleted file mode 120000 index 8b498d2ca..000000000 --- a/serverBin/jungfrauDetectorServerv7.0.0.rc3 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv7.0.0.rc5 b/serverBin/jungfrauDetectorServerv7.0.0.rc5 new file mode 120000 index 000000000..322e44386 --- /dev/null +++ b/serverBin/jungfrauDetectorServerv7.0.0.rc5 @@ -0,0 +1 @@ +../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc5 \ No newline at end of file diff --git a/serverBin/moenchDetectorServerv7.0.0.rc3 b/serverBin/moenchDetectorServerv7.0.0.rc3 deleted file mode 120000 index c12af9534..000000000 --- a/serverBin/moenchDetectorServerv7.0.0.rc3 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/moenchDetectorServerv7.0.0.rc5 b/serverBin/moenchDetectorServerv7.0.0.rc5 new file mode 120000 index 000000000..fa29664cf --- /dev/null +++ b/serverBin/moenchDetectorServerv7.0.0.rc5 @@ -0,0 +1 @@ +../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc5 \ No newline at end of file diff --git a/serverBin/mythen3DetectorServerv7.0.0.rc3 b/serverBin/mythen3DetectorServerv7.0.0.rc3 deleted file mode 120000 index 5b1dfa7f3..000000000 --- a/serverBin/mythen3DetectorServerv7.0.0.rc3 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/mythen3DetectorServerv7.0.0.rc5 b/serverBin/mythen3DetectorServerv7.0.0.rc5 new file mode 120000 index 000000000..56d5e20da --- /dev/null +++ b/serverBin/mythen3DetectorServerv7.0.0.rc5 @@ -0,0 +1 @@ +../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc5 \ No newline at end of file diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc3 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc3 deleted file mode 100755 index 87704a945..000000000 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc3 and /dev/null differ diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc5 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc5 new file mode 100755 index 000000000..36f3ae475 Binary files /dev/null and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc5 differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index a55b61a28..dddb324f8 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -99,7 +99,7 @@ void basictests() { #endif if (mapCSP0() == FAIL) { strcpy(initErrorMessage, - "Could not map to memory. Dangerous to continue.\n"); + "Could not map to memory. Cannot proceed. Check Firmware.\n"); LOG(logERROR, (initErrorMessage)); initError = FAIL; return; @@ -109,8 +109,10 @@ void basictests() { if ((!debugflag) && (!updateFlag) && ((checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL))) { - strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. " - "Dangerous to continue.\n"); + sprintf(initErrorMessage, + "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)); initError = FAIL; return; @@ -446,7 +448,7 @@ void initStopServer() { if (mapCSP0() == FAIL) { initError = FAIL; strcpy(initErrorMessage, - "Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); + "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n"); LOG(logERROR, (initErrorMessage)); initCheckDone = 1; return; diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc3 b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc5 similarity index 58% rename from slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc3 rename to slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc5 index 683cbd643..07939f70e 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc3 and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc5 differ diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index 7b1162277..886d947ee 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -93,7 +93,7 @@ void basictests() { #endif if (mapCSP0() == FAIL) { strcpy(initErrorMessage, - "Could not map to memory. Dangerous to continue.\n"); + "Could not map to memory. Cannot proceed. Check Firmware.\n"); LOG(logERROR, (initErrorMessage)); initError = FAIL; return; @@ -105,8 +105,8 @@ void basictests() { (checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL))) { sprintf(initErrorMessage, - "Could not pass basic tests of FPGA and bus. Dangerous to " - "continue. (Firmware version:0x%llx) \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)); initError = FAIL; @@ -396,7 +396,7 @@ void initStopServer() { if (mapCSP0() == FAIL) { initError = FAIL; strcpy(initErrorMessage, - "Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); + "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n"); LOG(logERROR, (initErrorMessage)); initCheckDone = 1; return; diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc3 b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc5 similarity index 68% rename from slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc3 rename to slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc5 index 99396d4ec..e43119ff3 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc3 and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc5 differ diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c index c56930140..ebdca8fa0 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c @@ -87,7 +87,7 @@ void basictests() { #endif if (mapCSP0() == FAIL) { strcpy(initErrorMessage, - "Could not map to memory. Dangerous to continue.\n"); + "Could not map to memory. Cannot proceed. Check Firmware.\n"); LOG(logERROR, (initErrorMessage)); initError = FAIL; } @@ -97,7 +97,7 @@ void basictests() { ((checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL))) { 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)); initError = FAIL; return; @@ -381,7 +381,7 @@ void initStopServer() { if (mapCSP0() == FAIL) { initError = FAIL; strcpy(initErrorMessage, - "Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); + "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n"); LOG(logERROR, (initErrorMessage)); initCheckDone = 1; return; diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc5 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc5 index 3b7ac210f..2779de3b4 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc5 and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc5 differ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 3eb11d2aa..62ea6fe04 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -82,7 +82,7 @@ void basictests() { #endif if (mapCSP0() == FAIL) { strcpy(initErrorMessage, - "Could not map to memory. Dangerous to continue.\n"); + "Could not map to memory. Cannot proceed. Check Firmware.\n"); LOG(logERROR, (initErrorMessage)); initError = FAIL; } @@ -91,8 +91,10 @@ void basictests() { if ((!debugflag) && (!updateFlag) && ((checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL))) { - strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. " - "Dangerous to continue.\n"); + sprintf(initErrorMessage, + "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)); initError = FAIL; return; @@ -428,7 +430,7 @@ void initStopServer() { if (mapCSP0() == FAIL) { initError = FAIL; strcpy(initErrorMessage, - "Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); + "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n"); LOG(logERROR, (initErrorMessage)); initCheckDone = 1; return; diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc3 b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc3 deleted file mode 100755 index f33535177..000000000 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc3 and /dev/null differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc5 b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc5 new file mode 100755 index 000000000..c9d758054 Binary files /dev/null and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc5 differ diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index f327b5071..c9aa95091 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -103,7 +103,7 @@ void basictests() { #endif if (mapCSP0() == FAIL) { 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)); initError = FAIL; return; @@ -113,8 +113,10 @@ void basictests() { if ((!debugflag) && (!updateFlag) && ((checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL))) { - strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. " - "Dangerous to continue.\n"); + sprintf(initErrorMessage, + "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)); initError = FAIL; return; @@ -451,7 +453,7 @@ void initStopServer() { if (mapCSP0() == FAIL) { initError = FAIL; strcpy(initErrorMessage, - "Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); + "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n"); LOG(logERROR, (initErrorMessage)); initCheckDone = 1; return; diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc3 b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc5 similarity index 79% rename from slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc3 rename to slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc5 index c7a5ee2f0..3de09ffb4 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc3 and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc5 differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index 215c06ba2..ee8ee9bc5 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -89,7 +89,7 @@ void basictests() { #endif if (mapCSP0() == FAIL) { strcpy(initErrorMessage, - "Could not map to memory. Dangerous to continue.\n"); + "Could not map to memory. Cannot proceed. Check Firmware.\n"); LOG(logERROR, (initErrorMessage)); initError = FAIL; } @@ -99,8 +99,10 @@ void basictests() { ((validateKernelVersion(KERNEL_DATE_VRSN) == FAIL) || (checkType() == FAIL) || (testFpga() == FAIL) || (testBus() == FAIL))) { - strcpy(initErrorMessage, "Could not pass basic tests of FPGA and bus. " - "Dangerous to continue.\n"); + sprintf(initErrorMessage, + "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)); initError = FAIL; return; @@ -388,7 +390,7 @@ void initStopServer() { if (mapCSP0() == FAIL) { initError = FAIL; strcpy(initErrorMessage, - "Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"); + "Stop Server: Map Fail. Cannot proceed. Check Firmware. \n"); LOG(logERROR, (initErrorMessage)); initCheckDone = 1; return; diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index eb42ea312..9f06d5890 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -2,12 +2,12 @@ // Copyright (C) 2021 Contributors to the SLS Detector Package /** API versions */ #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 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"