diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv8.0.0 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv8.0.0 index d0f5ecbe3..cc1d6e456 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv8.0.0 and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv8.0.0 differ diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv8.0.0 b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv8.0.0 index 848eb4610..4c0c6d764 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv8.0.0 and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv8.0.0 differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv8.0.0 b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv8.0.0 index 1870c870a..7d1d5f950 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv8.0.0 and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv8.0.0 differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv8.0.0 b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv8.0.0 index 98e210ae5..473b153f8 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv8.0.0 and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv8.0.0 differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0 index 837dca58a..6df1b8460 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0 and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0 differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv8.0.0 b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv8.0.0 index 16844fdcd..52a6c6e67 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv8.0.0 and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv8.0.0 differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0 b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0 index 46385739e..b4bcffd6a 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0 and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0 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 0475e34ef..9b671d335 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,10 +4,10 @@ #define RELEASE "8.0.0" #define APILIB "8.0.0 0x231025" #define APIRECEIVER "8.0.0 0x231025" -#define APICTB "8.0.0 0x231031" -#define APIGOTTHARD "8.0.0 0x231031" -#define APIGOTTHARD2 "8.0.0 0x231031" -#define APIJUNGFRAU "8.0.0 0x231031" -#define APIMYTHEN3 "8.0.0 0x231031" -#define APIMOENCH "8.0.0 0x231031" -#define APIEIGER "8.0.0 0x231031" +#define APICTB "8.0.0 0x231108" +#define APIGOTTHARD "8.0.0 0x231108" +#define APIGOTTHARD2 "8.0.0 0x231108" +#define APIJUNGFRAU "8.0.0 0x231108" +#define APIMYTHEN3 "8.0.0 0x231108" +#define APIMOENCH "8.0.0 0x231108" +#define APIEIGER "8.0.0 0x231108"