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

WIP

Browse Source
This commit is contained in:
maliakal_d 2020-06-30 12:09:23 +02:00
parent ff729fb43f
commit 279986d77c
8 changed files with 5 additions and 3 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/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.

6
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -1741,7 +1741,7 @@ int start_state_machine(int blocking, int file_des) {
if (scanTrimbits) { if (scanTrimbits) {
LOG(logINFOBLUE, ("Trimbits scan %d/%d: [%d]\n", i, times, LOG(logINFOBLUE, ("Trimbits scan %d/%d: [%d]\n", i, times,
scanSteps[i])); scanSteps[i]));
#ifdef EIGERD #if defined(EIGERD) || defined(MYTHEN3D)
setAllTrimbits(scanSteps[i]); setAllTrimbits(scanSteps[i]);
#else #else
LOG(logERROR, ("trimbit scan not implemented!\n")); LOG(logERROR, ("trimbit scan not implemented!\n"));
@ -7512,7 +7512,7 @@ int enable_scan(int file_des) {
} else { } else {
// trimbit scan // trimbit scan
if (args[0] == TRIMBIT_SCAN) { if (args[0] == TRIMBIT_SCAN) {
#ifdef EIGERD #if defined(EIGERD) || defined(MYTHEN3D)
if (startOffset < 0 || startOffset > MAX_TRIMBITS_VALUE || if (startOffset < 0 || startOffset > MAX_TRIMBITS_VALUE ||
endOffset < 0 || endOffset > MAX_TRIMBITS_VALUE) { endOffset < 0 || endOffset > MAX_TRIMBITS_VALUE) {
ret = FAIL; ret = FAIL;
@ -7521,11 +7521,13 @@ int enable_scan(int file_des) {
} else { } else {
scanTrimbits = 1; scanTrimbits = 1;
LOG(logINFOBLUE, ("Trimbit scan enabled\n")); LOG(logINFOBLUE, ("Trimbit scan enabled\n"));
#ifdef EIGERD
// changes settings to undefined // changes settings to undefined
setSettings(UNDEFINED); setSettings(UNDEFINED);
LOG(logERROR, LOG(logERROR,
("Settings has been changed to undefined (change all " ("Settings has been changed to undefined (change all "
"trimbits)\n")); "trimbits)\n"));
#endif
} }
#else #else
ret = FAIL; ret = FAIL;

2
slsSupportLib/include/versionAPI.h
View File

@ -7,6 +7,6 @@
#define APIGOTTHARD 0x200630 #define APIGOTTHARD 0x200630
#define APIGOTTHARD2 0x200630 #define APIGOTTHARD2 0x200630
#define APIJUNGFRAU 0x200630 #define APIJUNGFRAU 0x200630
#define APIMYTHEN3 0x200630
#define APIMOENCH 0x200630 #define APIMOENCH 0x200630
#define APIMYTHEN3 0x200630
#define APIEIGER 0x200630 #define APIEIGER 0x200630