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

execute command inside server fixed (from fix simulator tests and exec command PR) (#857)

Browse Source
This commit is contained in:
maliakal_d 2023-11-08 09:26:11 +01:00 committed by GitHub
parent 1a7c74fe4e
commit 7d7ac26c30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 11 additions and 10 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.

2
slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
View File

@ -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();

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

@ -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) {

14
slsSupportLib/include/sls/versionAPI.h
View File

@ -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"