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

merge conflict fixed and merged with developer

Browse Source
This commit is contained in:
maliakal_d 2020-09-09 12:31:36 +02:00
commit b33fdf4462
9 changed files with 11 additions and 9 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/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

5
slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c
View File

@ -49,7 +49,6 @@ int main(int argc, char *argv[]) {
memset(helpMessage, 0, MAX_STR_LENGTH);
sprintf(
helpMessage,
"\n\n"
"Usage: %s [arguments]\n"
"Possible arguments are:\n"
"\t-v, --version : Software version\n"
@ -148,8 +147,10 @@ int main(int argc, char *argv[]) {
break;
case 'h':
printf("%s", helpMessage);
exit(EXIT_SUCCESS);
default:
LOG(logERROR, (helpMessage));
printf("\n%s", helpMessage);
exit(EXIT_FAILURE);
}
}

15
slsSupportLib/include/versionAPI.h
View File

@ -3,10 +3,11 @@
#define APILIB 0x200810
#define APIRECEIVER 0x200810
#define APIGUI 0x200804
#define APIEIGER 0x200908
#define APICTB 0x200908
#define APIGOTTHARD 0x200908
#define APIGOTTHARD2 0x200908
#define APIJUNGFRAU 0x200908
#define APIMOENCH 0x200908
#define APIMYTHEN3 0x200908
#define APICTB 0x200909
#define APIGOTTHARD 0x200909
#define APIGOTTHARD2 0x200909
#define APIJUNGFRAU 0x200909
#define APIMOENCH 0x200909
#define APIEIGER 0x200909
#define APIMYTHEN3 0x200909