diff --git a/RELEASE.txt b/RELEASE.txt index 20e2d0fcb..6787b4623 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -26,6 +26,7 @@ This document describes the differences between v6.1.0 and v6.0.0. - refactoring (rxr) - fixed patsetbit and patsetmask for moench - changed default vref of adc9257 to 2V for moench (from 1.33V) +- mythen server kernel check incompatible (cet timezone) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 19faf88ce..b394f5c04 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index a09e3b544..8ffc5c33b 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 3a6fb2295..cb4bc8343 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index 23eb85bab..e948d4822 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 115ea8b17..f1797970d 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 1c2985c0c..9ac1a312a 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 2bcbd40fe..7243a3aa0 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/src/common.c b/slsDetectorServers/slsDetectorServer/src/common.c index 77e8d3f9a..6058e6f30 100644 --- a/slsDetectorServers/slsDetectorServer/src/common.c +++ b/slsDetectorServers/slsDetectorServer/src/common.c @@ -76,6 +76,11 @@ int getTimeFromString(char *buf, time_t *result) { LOG(logDEBUG, ("kernel v %s\n", buffer)); const char *timezone = {"CEST"}; char *res = strstr(buffer, timezone); + // remove CET as well + if (res == NULL) { + strcpy(timezone, "CET"); + res = strstr(buffer, timezone); + } if (res != NULL) { size_t cestPos = res - buffer; size_t pos = cestPos + strlen(timezone) + 1; diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 31c2a88c5..0f8925062 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -6,10 +6,10 @@ #define APIRECEIVER 0x211124 #define APIGUI 0x211124 -#define APIEIGER 0x220124 -#define APICTB 0x220124 -#define APIGOTTHARD 0x220124 -#define APIGOTTHARD2 0x220124 -#define APIJUNGFRAU 0x220124 -#define APIMYTHEN3 0x220124 -#define APIMOENCH 0x220124 +#define APIEIGER 0x220128 +#define APICTB 0x220128 +#define APIGOTTHARD 0x220128 +#define APIGOTTHARD2 0x220128 +#define APIJUNGFRAU 0x220128 +#define APIMYTHEN3 0x220128 +#define APIMOENCH 0x220128