detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 15:00:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into rxframeindex

Browse Source
This commit is contained in:
maliakal_d 2022-01-31 10:17:25 +01:00
commit aa992840b6
9 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/slsDetectorServer/src/common.c
View File

@ -74,7 +74,8 @@ int getTimeFromString(char *buf, time_t *result) {
// remove timezone as strptime cannot validate timezone despite // remove timezone as strptime cannot validate timezone despite
// documentation (for blackfin) // documentation (for blackfin)
LOG(logDEBUG, ("kernel v %s\n", buffer)); LOG(logDEBUG, ("kernel v %s\n", buffer));
const char *timezone = {"CEST"}; char timezone[8] = {0};
strcpy(timezone, "CEST");
char *res = strstr(buffer, timezone); char *res = strstr(buffer, timezone);
// remove CET as well // remove CET as well
if (res == NULL) { if (res == NULL) {

14
slsSupportLib/include/sls/versionAPI.h
View File

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