Merge branch 'developer' into naming

2026-01-16 00:14:37 +01:00 · 2021-09-17 10:41:51 +02:00
parent 81b8f17b32 90d8ad40c9
commit 0e193615b9
9 changed files with 7 additions and 7 deletions
--- a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
+++ b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
--- a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
+++ b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
--- a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
+++ b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
--- a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
+++ b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
--- a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
+++ b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
--- a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
+++ b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
--- a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
+++ b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
--- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
@@ -1503,7 +1503,7 @@ int set_module(int file_des) {
    ret = OK;
    memset(mess, 0, sizeof(mess));

-#if !(defined(MYTHEN3D) && defined(EIGERD))
+#if !(defined(MYTHEN3D) || defined(EIGERD))
    functionNotImplemented();
 #else

--- a/slsSupportLib/include/sls/versionAPI.h
+++ b/slsSupportLib/include/sls/versionAPI.h
@@ -4,10 +4,10 @@
 #define APIRECEIVER 0x210831
 #define APIGUI 0x210819

-#define APIEIGER 0x210916
-#define APICTB 0x210916
-#define APIGOTTHARD 0x210916
-#define APIGOTTHARD2 0x210916
-#define APIJUNGFRAU 0x210916
-#define APIMYTHEN3 0x210916
+#define APICTB 0x210917
+#define APIGOTTHARD 0x210917
+#define APIGOTTHARD2 0x210917
+#define APIJUNGFRAU 0x210917
+#define APIMYTHEN3 0x210917
 #define APIMOENCH 0x210916
+#define APIEIGER 0x210917