diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 853927404..3e3a18e9e 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index 83bb4e594..e0544455f 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index e964bd83d..40935898f 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 4891dd459..09af215a0 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 6a7f35571..bccdf98d0 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 2d11a95cb..391942c4e 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 e716a5aa9..4f5714204 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c index 2f9e3467b..eb7cbaae0 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c @@ -66,32 +66,47 @@ int main(int argc, char *argv[]) { #endif // help message - char helpMessage[MAX_STR_LENGTH]; - memset(helpMessage, 0, MAX_STR_LENGTH); - sprintf( - helpMessage, - "Usage: %s [arguments]\n" - "Possible arguments are:\n" - "\t-v, --version : Software version\n" - "\t-p, --port : TCP communication port with client. \n" - "\t-g, --nomodule : [Mythen3][Gotthard2] \n" - "\t Generic or No Module mode. Skips " - "detector type checks. \n" - "\t-f, --phaseshift : [Gotthard] only. Sets phase shift. \n" - "\t-d, --devel : Developer mode. Skips firmware checks. \n" - "\t-u, --update : Update mode. Skips firmware checks and " - "initial detector setup. \n" - "\t-i, --ignore-config : " - "[Eiger][Jungfrau][Gotthard][Gotthard2] \n" - "\t Ignore config file. \n" - "\t-m, --master : [Eiger][Mythen3][Gotthard][Gotthard2] \n" - "\t Set Master to 0 or 1. Precedence over " - "config file. Only for virtual servers except Eiger. \n" - "\t-t, --top : [Eiger] Set Top to 0 or 1. Precedence " - "over config file. \n" - "\t-s, --stopserver : Stop server. Do not use as it is created " - "by control server \n\n", - argv[0]); + const size_t helpMessageSize = 1200; + char helpMessage[helpMessageSize]; + { + memset(helpMessage, 0, helpMessageSize); + int len = snprintf( + helpMessage, helpMessageSize, + "Usage: %s [arguments]\n" + "Possible arguments are:\n" + "\t-v, --version : Software version\n" + "\t-p, --port : TCP communication port with client. " + "\n" + "\t-g, --nomodule : [Mythen3][Gotthard2] \n" + "\t Generic or No Module mode. Skips " + "detector type checks. \n" + "\t-f, --phaseshift : [Gotthard] only. Sets phase shift. \n" + "\t-d, --devel : Developer mode. Skips firmware " + "checks. \n" + "\t-u, --update : Update mode. Skips firmware checks " + "and " + "initial detector setup. \n" + "\t-i, --ignore-config : " + "[Eiger][Jungfrau][Gotthard][Gotthard2] \n" + "\t Ignore config file. \n" + "\t-m, --master : " + "[Eiger][Mythen3][Gotthard][Gotthard2] \n" + "\t Set Master to 0 or 1. Precedence " + "over " + "config file. Only for virtual servers except Eiger. \n" + "\t-t, --top : [Eiger] Set Top to 0 or 1. " + "Precedence " + "over config file. \n" + "\t-s, --stopserver : Stop server. Do not use as it is " + "created " + "by control server \n\n", + argv[0]); + if (len >= helpMessageSize) { + LOG(logERROR, ("Help for Server command line arguments size %d " + "exceed capacity of %d characters\n", + len, helpMessageSize)); + } + } // parse command line for config static struct option long_options[] = { diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index b2e668839..04645699b 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -5,11 +5,11 @@ #define APILIB 0x211125 #define APIRECEIVER 0x211124 #define APIGUI 0x211124 -#define APICTB 0x220317 -#define APIGOTTHARD 0x220317 -#define APIGOTTHARD2 0x220317 -#define APIJUNGFRAU 0x220317 -#define APIMYTHEN3 0x220317 -#define APIMOENCH 0x220317 -#define APIEIGER 0x220317 +#define APICTB 0x220318 +#define APIGOTTHARD 0x220318 +#define APIGOTTHARD2 0x220318 +#define APIJUNGFRAU 0x220318 +#define APIMYTHEN3 0x220318 +#define APIMOENCH 0x220318 +#define APIEIGER 0x220318