From db88f67cdade8e75d2ec5822adcddd06c509e183 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 9 Nov 2021 15:37:12 +0100 Subject: [PATCH] unknown function enum error proper print --- .../src/slsDetectorServer_funcs.c | 34 ++++--------------- slsDetectorSoftware/src/DetectorImpl.cpp | 2 +- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 3417e47e9..0c39d6ee3 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -432,7 +432,9 @@ void function_table() { void functionNotImplemented() { 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)); LOG(logERROR, (mess)); } @@ -484,17 +486,8 @@ int executeCommand(char *command, char *result, enum TLogLevel level) { } int M_nofunc(int file_des) { - ret = FAIL; memset(mess, 0, sizeof(mess)); - - // 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)); + functionNotImplemented(); 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 - else if (Server_VerifyLock() == OK) { + if (ret == OK && Server_VerifyLock() == OK) { // check index // setsettings @@ -3642,11 +3628,8 @@ int program_fpga(int file_des) { memset(mess, 0, sizeof(mess)); #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(); + return Server_SendResult(file_des, INT32, NULL, 0); #else receive_program(file_des, PROGRAM_FPGA); #endif @@ -9321,11 +9304,8 @@ int update_kernel(int file_des) { memset(mess, 0, sizeof(mess)); #if !defined(JUNGFRAUD) && !defined(CHIPTESTBOARDD) && !defined(MOENCHD) && \ !defined(GOTTHARDD) - // to receive any arguments - int n = 1; - while (n > 0) - n = receiveData(file_des, mess, MAX_STR_LENGTH, OTHER); functionNotImplemented(); + return Server_SendResult(file_des, INT32, NULL, 0); #else receive_program(file_des, PROGRAM_KERNEL); #endif diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index 2197719a2..3a9634f75 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -1359,7 +1359,7 @@ std::vector DetectorImpl::readProgrammingFile(const std::string &fname) { if (close(dst) != 0) { 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 std::vector buffer = readBinaryFile(destfname, "Program FPGA");