Merge pull request #354 from slsdetectorgroup/mythenkernelfix

Mythenkernelfix

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)
 
 
 

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;

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