detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

binaries in after merge

Browse Source
This commit is contained in:
maliakal_d
2022-01-28 16:09:12 +01:00
parent 5d4c35ddbe 76901d4135
commit bae41e74eb
9 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RELEASE.txt
View File

@ -26,7 +26,11 @@ This document describes the differences between v6.1.0 and v6.0.0.
- refactoring (rxr) - refactoring (rxr)
- fixed patsetbit and patsetmask for moench - fixed patsetbit and patsetmask for moench
- changed default vref of adc9257 to 2V for moench (from 1.33V) - changed default vref of adc9257 to 2V for moench (from 1.33V)
<<<<<<< HEAD
- moench and ctb - can set the starting frame number of next acquisition - moench and ctb - can set the starting frame number of next acquisition
=======
- mythen server kernel check incompatible (cet timezone)
>>>>>>> developer

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.

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

@ -76,6 +76,11 @@ int getTimeFromString(char *buf, time_t *result) {
LOG(logDEBUG, ("kernel v %s\n", buffer)); LOG(logDEBUG, ("kernel v %s\n", buffer));
const char *timezone = {"CEST"}; const char *timezone = {"CEST"};
char *res = strstr(buffer, timezone); char *res = strstr(buffer, timezone);
// remove CET as well
if (res == NULL) {
strcpy(timezone, "CET");
res = strstr(buffer, timezone);
}
if (res != NULL) { if (res != NULL) {
size_t cestPos = res - buffer; size_t cestPos = res - buffer;
size_t pos = cestPos + strlen(timezone) + 1; size_t pos = cestPos + strlen(timezone) + 1;