diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer deleted file mode 100755 index 2efa91001..000000000 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and /dev/null differ diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.3 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.3 index 8f7165b30..8440ce013 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.3 and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.3 differ diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer deleted file mode 100755 index 15c62eacb..000000000 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and /dev/null differ diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.3 b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.3 index 0616a400d..a7e8b1e53 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.3 and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.3 differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer deleted file mode 100755 index b24084e70..000000000 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and /dev/null differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.3 b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.3 index e30932a09..1563d37d2 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.3 and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.3 differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer deleted file mode 100755 index 4f68e4a00..000000000 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and /dev/null differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.3 b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.3 index bab5043eb..d8cfd5432 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.3 and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.3 differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer deleted file mode 100755 index 26cc72699..000000000 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and /dev/null differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.3 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.3 index 6a7af5b83..e914643ea 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.3 and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.3 differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer deleted file mode 100755 index a63ae31af..000000000 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and /dev/null differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.3 b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.3 index 923095df0..d1c4f2df1 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.3 and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.3 differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer deleted file mode 100755 index 72e010f0c..000000000 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and /dev/null differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.3 b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.3 index 2a70ddf51..9eb00ee49 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.3 and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.3 differ diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h index f9d052f59..65ea37fbd 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 ffdc0a359..255ed9e13 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -499,7 +499,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)); @@ -518,7 +518,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 @@ -543,6 +543,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 ba7a101f8..c40908ff3 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,10 +4,10 @@ #define RELEASE "7.0.3" #define APILIB "7.0.3 0x231024" #define APIRECEIVER "7.0.3 0x231024" -#define APICTB "7.0.3 0x231031" -#define APIGOTTHARD "7.0.3 0x231031" -#define APIGOTTHARD2 "7.0.3 0x231031" -#define APIJUNGFRAU "7.0.3 0x231031" -#define APIMYTHEN3 "7.0.3 0x231031" -#define APIMOENCH "7.0.3 0x231031" -#define APIEIGER "7.0.3 0x231031" +#define APICTB "7.0.3 0x231107" +#define APIGOTTHARD "7.0.3 0x231107" +#define APIGOTTHARD2 "7.0.3 0x231107" +#define APIJUNGFRAU "7.0.3 0x231107" +#define APIMYTHEN3 "7.0.3 0x231107" +#define APIMOENCH "7.0.3 0x231107" +#define APIEIGER "7.0.3 0x231107"