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

wip

Browse Source
This commit is contained in:
maliakal_d 2021-09-02 15:46:31 +02:00
parent e0f686231a
commit 4daac1a06a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3723,7 +3723,7 @@ int program_fpga(int file_des) {
// filesize // filesize
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", LOG(logINFOBLUE, ("Program size is: %lld\n",
(long long unsigned int)filesize)); (long long unsigned int)filesize));
fpgasrc = malloc(filesize + 1); fpgasrc = malloc(filesize + 1);
@ -3735,7 +3735,7 @@ int program_fpga(int file_des) {
uint64_t unitprogramsize = MAX_FPGAPROGRAMSIZE; // 2mb uint64_t unitprogramsize = MAX_FPGAPROGRAMSIZE; // 2mb
if (offset + unitprogramsize > filesize) // less than 2mb if (offset + unitprogramsize > filesize) // less than 2mb
unitprogramsize = filesize - offset; unitprogramsize = filesize - offset;
LOG(logDEBUG1, ("unit size to receive is:%lld [offset:%lld, filesize:%lld]\n", LOG(logINFOBLUE, ("unit size to receive is:%lld [offset:%lld, filesize:%lld]\n",
(long long unsigned int)unitprogramsize, (long long unsigned int)unitprogramsize,
(long long unsigned int)offset, (long long unsigned int)filesize)); (long long unsigned int)offset, (long long unsigned int)filesize));

4
slsDetectorSoftware/src/Module.cpp
View File

@ -3430,8 +3430,8 @@ void Module::programFPGAviaBlackfin(std::vector<char> buffer) {
if (unitprogramsize > filesize) { // less than 2mb if (unitprogramsize > filesize) { // less than 2mb
unitprogramsize = filesize; unitprogramsize = filesize;
} }
LOG(logDEBUG1) << "unitprogramsize:" << unitprogramsize LOG(logINFOBLUE) << "unitprogramsize:" << unitprogramsize
<< "\t filesize:" << filesize; << "\t filesize:" << filesize;
client.Send(&buffer[currentPointer], unitprogramsize); client.Send(&buffer[currentPointer], unitprogramsize);
if (client.Receive<int>() == FAIL) { if (client.Receive<int>() == FAIL) {