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

wip

Browse Source
This commit is contained in:
maliakal_d 2021-09-03 14:35:34 +02:00
parent 20deeb8dcc
commit 4badb1141c
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c
View File

@ -174,7 +174,7 @@ int startCopyingFPGAProgram(FILE **fd, uint64_t fsize, char *mess) {
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }
LOG(logINFO, ("%s ready to copy program\n", TEMP_PROG_FILE_NAME)); LOG(logINFO, ("ready to copy program to %s\n", TEMP_PROG_FILE_NAME));
return OK; return OK;
} }

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

@ -3746,8 +3746,7 @@ int program_fpga(int file_des) {
uint64_t unitprogramsize = MAX_FPGAPROGRAMSIZE; // 2mb uint64_t unitprogramsize = MAX_FPGAPROGRAMSIZE; // 2mb
if (unitprogramsize > filesize) // less than 2mb if (unitprogramsize > filesize) // less than 2mb
unitprogramsize = filesize; unitprogramsize = filesize;
LOG(logINFOBLUE, LOG(logDEBUG1, ("unit size to receive is:%lld [filesize:%lld]\n",
("unit size to receive is:%lld [filesize:%lld]\n",
(long long unsigned int)unitprogramsize, (long long unsigned int)unitprogramsize,
(long long unsigned int)filesize)); (long long unsigned int)filesize));

3
slsDetectorSoftware/src/Module.cpp
View File

@ -3436,11 +3436,10 @@ void Module::programFPGAviaBlackfin(std::vector<char> buffer) {
if (unitprogramsize > filesize) { // less than 2mb if (unitprogramsize > filesize) { // less than 2mb
unitprogramsize = filesize; unitprogramsize = filesize;
} }
LOG(logINFOBLUE) << "unitprogramsize:" << unitprogramsize LOG(logDEBUG) << "unitprogramsize:" << unitprogramsize
<< "\t filesize:" << filesize; << "\t filesize:" << filesize;
client.Send(&buffer[currentPointer], unitprogramsize); client.Send(&buffer[currentPointer], unitprogramsize);
LOG(logINFOBLUE) << "sent!";
if (client.Receive<int>() == FAIL) { if (client.Receive<int>() == FAIL) {
std::cout << '\n'; std::cout << '\n';
std::ostringstream os; std::ostringstream os;