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

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

Browse Source
This commit is contained in:
maliakal_d 2023-11-08 09:26:00 +01:00 committed by GitHub
parent 573177203b
commit beafe86554
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/ctbDetectorServerv8.0.0
View File

Binary file not shown.

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv8.0.0
View File

Binary file not shown.

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv8.0.0
View File

Binary file not shown.

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv8.0.0
View File

Binary file not shown.

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0
View File

Binary file not shown.

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv8.0.0
View File

Binary file not shown.

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0
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 function_table();
void functionNotImplemented(); void functionNotImplemented();
void modeNotImplemented(char *modename, int mode); 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); int M_nofunc(int);
#if defined(MYTHEN3D) || defined(GOTTHARD2D) #if defined(MYTHEN3D) || defined(GOTTHARD2D)
void rebootNiosControllerAndFPGA(); void rebootNiosControllerAndFPGA();

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

@ -516,7 +516,7 @@ void modeNotImplemented(char *modename, int mode) {
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} }
void executeCommand(char *command, char *result, enum TLogLevel level) { int executeCommand(char *command, char *result, enum TLogLevel level) {
ret = OK; ret = OK;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
@ -535,7 +535,7 @@ void executeCommand(char *command, char *result, enum TLogLevel level) {
if (sysFile == NULL) { if (sysFile == NULL) {
ret = FAIL; ret = FAIL;
sprintf(mess, "Executing cmd[%s] failed\n", cmd); sprintf(mess, "Executing cmd[%s] failed\n", cmd);
return; return ret;
} }
while (fgets(temp, tempsize, sysFile) != NULL) { while (fgets(temp, tempsize, sysFile) != NULL) {
// size left excludes terminating character // size left excludes terminating character
@ -560,6 +560,7 @@ void executeCommand(char *command, char *result, enum TLogLevel level) {
} else { } else {
LOG(level, ("Result:\n[%s]\n", result)); LOG(level, ("Result:\n[%s]\n", result));
} }
return ret;
} }
int M_nofunc(int file_des) { int M_nofunc(int file_des) {

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

@ -4,10 +4,10 @@
#define RELEASE "8.0.0" #define RELEASE "8.0.0"
#define APILIB "8.0.0 0x231025" #define APILIB "8.0.0 0x231025"
#define APIRECEIVER "8.0.0 0x231025" #define APIRECEIVER "8.0.0 0x231025"
#define APICTB "8.0.0 0x231031" #define APICTB "8.0.0 0x231108"
#define APIGOTTHARD "8.0.0 0x231031" #define APIGOTTHARD "8.0.0 0x231108"
#define APIGOTTHARD2 "8.0.0 0x231031" #define APIGOTTHARD2 "8.0.0 0x231108"
#define APIJUNGFRAU "8.0.0 0x231031" #define APIJUNGFRAU "8.0.0 0x231108"
#define APIMYTHEN3 "8.0.0 0x231031" #define APIMYTHEN3 "8.0.0 0x231108"
#define APIMOENCH "8.0.0 0x231031" #define APIMOENCH "8.0.0 0x231108"
#define APIEIGER "8.0.0 0x231031" #define APIEIGER "8.0.0 0x231108"