detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 19:30:03 +02:00
Code Issues Actions Packages Releases Activity

formatting

Browse Source
This commit is contained in:
maliakal_d 2020-05-11 20:09:45 +02:00
parent 88f801061f
commit ccf1889113
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -386,14 +386,14 @@ void getModuleConfiguration() {
} }
#ifdef VIRTUAL #ifdef VIRTUAL
#ifdef VIRTUAL_MASTER #ifdef VIRTUAL_MASTER
master = 1; master = 1;
top = 1; top = 1;
#else #else
master = 0; master = 0;
#ifdef VIRTUAL_TOP #ifdef VIRTUAL_TOP
top = 1; top = 1;
#else #else
top = 0; top = 0;
#endif #endif
#endif #endif
@ -587,7 +587,7 @@ void resetToHardwareSettings() {
return; return;
} }
int temp = -1, temp2 = -1; int temp = -1, temp2 = -1;
Beb_GetModuleConfiguration(&temp, &top, &temp2); Beb_GetModuleConfiguration(&temp, &top, &temp2);
Beb_SetTopVariable(top); Beb_SetTopVariable(top);
} }
// master not set in config file // master not set in config file
@ -607,7 +607,7 @@ void resetToHardwareSettings() {
return; return;
} }
int temp = -1, temp2 = -1; int temp = -1, temp2 = -1;
Beb_GetModuleConfiguration(&master, &temp, &temp2); Beb_GetModuleConfiguration(&master, &temp, &temp2);
Feb_Control_SetMasterVariable(master); Feb_Control_SetMasterVariable(master);
} }
#endif #endif

2
slsSupportLib/include/versionAPI.h
View File

@ -10,4 +10,4 @@
#define APIJUNGFRAU 0x200508 #define APIJUNGFRAU 0x200508
#define APIMYTHEN3 0x200508 #define APIMYTHEN3 0x200508
#define APIMOENCH 0x200508 #define APIMOENCH 0x200508
#define APIEIGER 0x200511 #define APIEIGER 0x200511