detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 03:10:02 +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:
Erik Frojdh 2019-09-30 15:00:11 +02:00
commit 3c6d7ca4a5
8 changed files with 5 additions and 7 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/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -359,7 +359,6 @@ int64_t getTimeLeft(enum timerIndex ind){
#ifdef VIRTUAL #ifdef VIRTUAL
return 0; return 0;
#endif #endif
#ifdef VIRTUAL // until Firmware is there
int64_t retval = -1; int64_t retval = -1;
switch(ind){ switch(ind){
@ -377,7 +376,6 @@ int64_t getTimeLeft(enum timerIndex ind){
FILE_LOG(logERROR, ("Remaining Timer index not implemented for this detector: %d\n", ind)); FILE_LOG(logERROR, ("Remaining Timer index not implemented for this detector: %d\n", ind));
break; break;
} }
#endif
return retval; return retval;
} }

10
slsSupportLib/include/versionAPI.h
View File

@ -4,9 +4,9 @@
#define APIRECEIVER 0x190722 #define APIRECEIVER 0x190722
#define APIGUI 0x190723 #define APIGUI 0x190723
#define APIMOENCH 0x190820 #define APIMOENCH 0x190820
#define APIJUNGFRAU 0x190927 #define APICTB 0x190930
#define APIGOTTHARD 0x190927 #define APIGOTTHARD 0x190930
#define APIGOTTHARD2 0x190930
#define APIJUNGFRAU 0x190930
#define APIMYTHEN3 0x190930 #define APIMYTHEN3 0x190930
#define APIEIGER 0x190926 #define APIEIGER 0x190930
#define APIGOTTHARD2 0x190927
#define APICTB 0x190927