diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index d669625a6..a3babe2ad 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 a7a6f7b99..6de67d735 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 62ce4539d..f7574accb 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 55ad7cae4..82417accf 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 b21888442..35c788fe2 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 bddb845fb..5f5a1828c 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 1a731bff1..b2ab33c88 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h index 7d5cbd35c..4bf70907f 100644 --- a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h +++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h @@ -17,7 +17,7 @@ const char *getRetName(); void function_table(); void functionNotImplemented(); void modeNotImplemented(char *modename, int mode); -void executeCommand(char *command, char *result, enum TLogLevel level); +int executeCommand(char *command, char *result, enum TLogLevel level); int M_nofunc(int); #if defined(MYTHEN3D) || defined(GOTTHARD2D) void rebootNiosControllerAndFPGA(); diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index e15bdbc15..aa4bb48a5 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -516,7 +516,7 @@ void modeNotImplemented(char *modename, int mode) { LOG(logERROR, (mess)); } -void executeCommand(char *command, char *result, enum TLogLevel level) { +int executeCommand(char *command, char *result, enum TLogLevel level) { ret = OK; memset(mess, 0, sizeof(mess)); @@ -535,7 +535,7 @@ void executeCommand(char *command, char *result, enum TLogLevel level) { if (sysFile == NULL) { ret = FAIL; sprintf(mess, "Executing cmd[%s] failed\n", cmd); - return; + return ret; } while (fgets(temp, tempsize, sysFile) != NULL) { // size left excludes terminating character @@ -560,6 +560,7 @@ void executeCommand(char *command, char *result, enum TLogLevel level) { } else { LOG(level, ("Result:\n[%s]\n", result)); } + return ret; } int M_nofunc(int file_des) { diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 2b55d8905..a1d345a42 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,10 +4,10 @@ #define RELEASE "developer" #define APILIB "developer 0x230224" #define APIRECEIVER "developer 0x230224" -#define APICTB "developer 0x231102" -#define APIGOTTHARD "developer 0x231102" -#define APIGOTTHARD2 "developer 0x231102" -#define APIJUNGFRAU "developer 0x231102" -#define APIMYTHEN3 "developer 0x231102" -#define APIMOENCH "developer 0x231102" -#define APIEIGER "developer 0x231102" +#define APICTB "developer 0x231108" +#define APIGOTTHARD "developer 0x231108" +#define APIGOTTHARD2 "developer 0x231108" +#define APIJUNGFRAU "developer 0x231108" +#define APIMYTHEN3 "developer 0x231108" +#define APIMOENCH "developer 0x231108" +#define APIEIGER "developer 0x231108"