Merge branch 'developer' into rxframeindex

slsDetectorServers/slsDetectorServer/src/common.c

@@ -74,7 +74,8 @@ int getTimeFromString(char *buf, time_t *result) {
     // remove timezone as strptime cannot validate timezone despite
     // documentation (for blackfin)
     LOG(logDEBUG, ("kernel v %s\n", buffer));
-    const char *timezone = {"CEST"};
+    char timezone[8] = {0};
+    strcpy(timezone, "CEST");
     char *res = strstr(buffer, timezone);
     // remove CET as well
     if (res == NULL) {
@@ -668,4 +669,4 @@ int deleteFile(char *mess, char *fname, char *errorPrefix) {
             ("\tFile does not exist anyway: %s (%s)\n", fullname, errorPrefix));
     }
     return OK;
-}
+}

slsSupportLib/include/sls/versionAPI.h

@@ -6,10 +6,10 @@
 #define APIRECEIVER 0x211124
 #define APIGUI 0x211124
 
-#define APICTB 0x220128
-#define APIGOTTHARD 0x220128
-#define APIGOTTHARD2 0x220128
-#define APIJUNGFRAU 0x220128
-#define APIMYTHEN3 0x220128
-#define APIMOENCH 0x220128
-#define APIEIGER 0x220128
+#define APICTB 0x220131
+#define APIGOTTHARD 0x220131
+#define APIGOTTHARD2 0x220131
+#define APIJUNGFRAU 0x220131
+#define APIMYTHEN3 0x220131
+#define APIMOENCH 0x220131
+#define APIEIGER 0x220131