diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 6f72dba26..d76cc6a83 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index e1e159225..2c9856b35 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index d2d5fa571..6e6fff310 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index df7ad401c..20e2bc152 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 95e68863f..d81e87f30 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 9dedfceaf..02bf6bd0a 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 6878b2d3b..9272a9fb8 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -1741,7 +1741,7 @@ int start_state_machine(int blocking, int file_des) { if (scanTrimbits) { LOG(logINFOBLUE, ("Trimbits scan %d/%d: [%d]\n", i, times, scanSteps[i])); -#ifdef EIGERD +#if defined(EIGERD) || defined(MYTHEN3D) setAllTrimbits(scanSteps[i]); #else LOG(logERROR, ("trimbit scan not implemented!\n")); @@ -7512,7 +7512,7 @@ int enable_scan(int file_des) { } else { // trimbit scan if (args[0] == TRIMBIT_SCAN) { -#ifdef EIGERD +#if defined(EIGERD) || defined(MYTHEN3D) if (startOffset < 0 || startOffset > MAX_TRIMBITS_VALUE || endOffset < 0 || endOffset > MAX_TRIMBITS_VALUE) { ret = FAIL; @@ -7521,11 +7521,13 @@ int enable_scan(int file_des) { } else { scanTrimbits = 1; LOG(logINFOBLUE, ("Trimbit scan enabled\n")); +#ifdef EIGERD // changes settings to undefined setSettings(UNDEFINED); LOG(logERROR, ("Settings has been changed to undefined (change all " "trimbits)\n")); +#endif } #else ret = FAIL; diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 6ce8eb3e0..0982e0d36 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -7,6 +7,6 @@ #define APIGOTTHARD 0x200630 #define APIGOTTHARD2 0x200630 #define APIJUNGFRAU 0x200630 -#define APIMYTHEN3 0x200630 #define APIMOENCH 0x200630 +#define APIMYTHEN3 0x200630 #define APIEIGER 0x200630