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

bugfix

Browse Source
This commit is contained in:
maliakal_d 2021-11-09 09:49:21 +01:00
parent 64a25a242b
commit 90b9b57865
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,7 +474,7 @@ int executeCommand(char *command, char *result, enum TLogLevel level) {
if (strlen(result)) { if (strlen(result)) {
if (success) { if (success) {
success = FAIL; success = FAIL;
LOG(logERROR, ("%s\n", result)); LOG(logERROR, ("Executing cmd[%s]:%s\n", cmdresult));
} else { } else {
LOG(level, ("Result:\n[%s]\n", result)); LOG(level, ("Result:\n[%s]\n", result));
} }
@ -9360,14 +9360,14 @@ int receive_program(int file_des, enum PROGRAM_INDEX index) {
uint64_t filesize = 0; uint64_t filesize = 0;
if (receiveData(file_des, &filesize, sizeof(filesize), INT64) < 0) if (receiveData(file_des, &filesize, sizeof(filesize), INT64) < 0)
return printSocketReadError(); return printSocketReadError();
LOG(logDEBUG1, ("Program size is: %lld\n", (long long int)filesize)); LOG(logINFO, ("\tProgram size: %lld\n", (long long int)filesize));
// client checksum // client checksum
char checksum[MAX_STR_LENGTH]; char checksum[MAX_STR_LENGTH];
memset(checksum, 0, MAX_STR_LENGTH); memset(checksum, 0, MAX_STR_LENGTH);
if (receiveData(file_des, checksum, MAX_STR_LENGTH, OTHER) < 0) if (receiveData(file_des, checksum, MAX_STR_LENGTH, OTHER) < 0)
return printSocketReadError(); return printSocketReadError();
LOG(logDEBUG1, ("checksum is: %s\n\n", checksum)); LOG(logINFO, ("\tChecksum: %s\n\n", checksum));
#if defined(GOTTHARD2D) || defined(MYTHEN3D) || defined(EIGERD) #if defined(GOTTHARD2D) || defined(MYTHEN3D) || defined(EIGERD)
receive_program_default(file_des, index, functionType, filesize, receive_program_default(file_des, index, functionType, filesize,
@ -9477,8 +9477,8 @@ void receive_program_via_blackfin(int file_des, enum PROGRAM_INDEX index,
switch (index) { switch (index) {
case PROGRAM_FPGA: case PROGRAM_FPGA:
case PROGRAM_KERNEL: case PROGRAM_KERNEL:
ret = ret = eraseAndWriteToFlash(mess, index, functionType, checksum,
eraseAndWriteToFlash(mess, index, functionType, checksum, filesize); totalsize);
break; break;
case PROGRAM_SERVER: case PROGRAM_SERVER:
break; break;

3
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -1262,8 +1262,7 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
throw RuntimeError("programfpga not implemented for this detector"); throw RuntimeError("programfpga not implemented for this detector");
} }
LOG(logINFO) LOG(logINFO) << "This can take awhile. Please be patient.";
<< "Updating Firmware. This can take awhile. Please be patient...";
LOG(logDEBUG1) << "Programming FPGA with file name:" << fname; LOG(logDEBUG1) << "Programming FPGA with file name:" << fname;
// check if it exists // check if it exists