diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 9b7695c84..4bc6dc6ef 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 5031c57c6..123a9cabb 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 759e540e4..5b14be7d1 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 8b380b988..f9e9fdd34 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 6baba306b..9d5cdadc7 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 7af6d0149..52125a2a6 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 6a9edea0b..d89e6b65c 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 89bfa0814..0d9d0ce74 100644 --- a/slsDetectorServers/slsDetectorServer/src/common.c +++ b/slsDetectorServers/slsDetectorServer/src/common.c @@ -66,26 +66,28 @@ int getAbsPath(char *buf, size_t bufSize, char *fname) { } int getTimeFromString(char *buf, time_t *result) { + char buffer[255] = {0}; + strcpy(buffer, buf); // remove timezone as strptime cannot validate timezone despite // documentation (for blackfin) - LOG(logDEBUG, ("buf for time %s\n", buf)); + LOG(logDEBUG, ("kernel v %s\n", buffer)); const char *timezone = {"CEST"}; - char *res = strstr(buf, timezone); + char *res = strstr(buffer, timezone); if (res != NULL) { - size_t cestPos = res - buf; + size_t cestPos = res - buffer; size_t pos = cestPos + strlen(timezone) + 1; - while (pos != strlen(buf)) { - buf[cestPos] = buf[pos]; + while (pos != strlen(buffer)) { + buffer[cestPos] = buffer[pos]; ++cestPos; ++pos; } - buf[cestPos] = '\0'; + buffer[cestPos] = '\0'; } - LOG(logDEBUG, ("buf after removing CEST %s\n", buf)); + LOG(logDEBUG, ("kernel v after removing CEST %s\n", buffer)); // convert to time structure struct tm t; - if (NULL == strptime(buf, "%a %b %d %H:%M:%S %Y", &t)) { + if (NULL == strptime(buffer, "%a %b %d %H:%M:%S %Y", &t)) { return FAIL; } diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 026e13fab..3b29c55f2 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -6,10 +6,10 @@ #define APILIB 0x211027 #define APIRECEIVER 0x211020 #define APIGUI 0x211021 -#define APIEIGER 0x211027 #define APICTB 0x211103 #define APIGOTTHARD 0x211103 #define APIGOTTHARD2 0x211103 #define APIJUNGFRAU 0x211103 #define APIMYTHEN3 0x211103 #define APIMOENCH 0x211103 +#define APIEIGER 0x211103