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

unknown function enum error proper print

Browse Source
This commit is contained in:
maliakal_d 2021-11-09 15:37:12 +01:00
parent f8e2522a11
commit db88f67cda
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,7 +432,9 @@ void function_table() {
void functionNotImplemented() { void functionNotImplemented() {
ret = FAIL; ret = FAIL;
sprintf(mess, "Function (%s) is not implemented for this detector\n", sprintf(mess,
"Function (%s) is not implemented for this detector. Please do not "
"proceed.\n",
getFunctionNameFromEnum((enum detFuncs)fnum)); getFunctionNameFromEnum((enum detFuncs)fnum));
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} }
@ -484,17 +486,8 @@ int executeCommand(char *command, char *result, enum TLogLevel level) {
} }
int M_nofunc(int file_des) { int M_nofunc(int file_des) {
ret = FAIL;
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
functionNotImplemented();
// to receive any arguments
int n = 1;
while (n > 0)
n = receiveData(file_des, mess, MAX_STR_LENGTH, OTHER);
sprintf(mess, "Unrecognized Function enum %d. Please do not proceed.\n",
fnum);
LOG(logERROR, (mess));
return Server_SendResult(file_des, OTHER, NULL, 0); return Server_SendResult(file_des, OTHER, NULL, 0);
} }
@ -1562,15 +1555,8 @@ int set_module(int file_des) {
} }
} }
// receive all arguments
if (ret == FAIL) {
int n = 1;
while (n > 0)
n = receiveData(file_des, mess, MAX_STR_LENGTH, OTHER);
}
// only set // only set
else if (Server_VerifyLock() == OK) { if (ret == OK && Server_VerifyLock() == OK) {
// check index // check index
// setsettings // setsettings
@ -3642,11 +3628,8 @@ int program_fpga(int file_des) {
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
#if defined(EIGERD) || defined(GOTTHARDD) #if defined(EIGERD) || defined(GOTTHARDD)
// to receive any arguments
int n = 1;
while (n > 0)
n = receiveData(file_des, mess, MAX_STR_LENGTH, OTHER);
functionNotImplemented(); functionNotImplemented();
return Server_SendResult(file_des, INT32, NULL, 0);
#else #else
receive_program(file_des, PROGRAM_FPGA); receive_program(file_des, PROGRAM_FPGA);
#endif #endif
@ -9321,11 +9304,8 @@ int update_kernel(int file_des) {
memset(mess, 0, sizeof(mess)); memset(mess, 0, sizeof(mess));
#if !defined(JUNGFRAUD) && !defined(CHIPTESTBOARDD) && !defined(MOENCHD) && \ #if !defined(JUNGFRAUD) && !defined(CHIPTESTBOARDD) && !defined(MOENCHD) && \
!defined(GOTTHARDD) !defined(GOTTHARDD)
// to receive any arguments
int n = 1;
while (n > 0)
n = receiveData(file_des, mess, MAX_STR_LENGTH, OTHER);
functionNotImplemented(); functionNotImplemented();
return Server_SendResult(file_des, INT32, NULL, 0);
#else #else
receive_program(file_des, PROGRAM_KERNEL); receive_program(file_des, PROGRAM_KERNEL);
#endif #endif

2
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -1359,7 +1359,7 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
if (close(dst) != 0) { if (close(dst) != 0) {
throw RuntimeError("Program FPGA: Could not close destination file"); throw RuntimeError("Program FPGA: Could not close destination file");
} }
LOG(logINFOBLUE) << "File has been converted to " << destfname; LOG(logINFO) << "File has been converted to " << destfname;
// load converted file to memory // load converted file to memory
std::vector<char> buffer = readBinaryFile(destfname, "Program FPGA"); std::vector<char> buffer = readBinaryFile(destfname, "Program FPGA");