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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
bergamaschi
2024-02-06 10:31:00 +01:00
parent ecda5db97e d17bc5da62
commit e5bea401a0
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
View File

@ -61,7 +61,7 @@
#define ASIC_FILTER_MAX_RES_VALUE (1) #define ASIC_FILTER_MAX_RES_VALUE (1)
#define MAX_SELECT_CHIP10_VAL (63) #define MAX_SELECT_CHIP10_VAL (63)
#define MAX_PHASE_SHIFTS (240) #define MAX_PHASE_SHIFTS (200)
#define BIT16_MASK (0xFFFF) #define BIT16_MASK (0xFFFF)
#define ADC_DECMT_QUARTER_SPEED (0x3) #define ADC_DECMT_QUARTER_SPEED (0x3)

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

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

@ -114,10 +114,11 @@ int getTimeFromString(char *buf, time_t *result) {
t.tm_mday, t.tm_mon, t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec)); t.tm_mday, t.tm_mon, t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec));
*result = mktime(&t); *result = mktime(&t);
if (*result == -1) { /* Do not check as it fails with nios
if (*result == (time_t)-1) {
LOG(logERROR, ("Could not convert time structure to time_t\n")); LOG(logERROR, ("Could not convert time structure to time_t\n"));
return FAIL; return FAIL;
} }*/
return OK; return OK;
} }