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

wip

Browse Source
This commit is contained in:
maliakal_d 2021-09-03 15:31:49 +02:00
parent d6d1d60800
commit 8c02b6636d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3771,7 +3771,7 @@ int program_fpga(int file_des) {
} }
// print progress // print progress
LOG(logINFO, LOG(logINFO,
("\tCopying Program to /var/tmp/:%d%%\r", ("\t%d%%\r",
(int)(((double)(totalsize - filesize) / totalsize) * 100))); (int)(((double)(totalsize - filesize) / totalsize) * 100)));
fflush(stdout); fflush(stdout);
} }

3
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -1303,7 +1303,7 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
// convert src to dst rawbin // convert src to dst rawbin
LOG(logDEBUG1) << "Converting " << fname << " to " << destfname; LOG(logDEBUG1) << "Converting " << fname << " to " << destfname;
LOG(logINFO) << "Converting program to rawbin (srcSise:" << srcSize << ")"; LOG(logINFO) << "Converting program to rawbin";
{ {
constexpr int pofNumHeaderBytes = 0x11C; constexpr int pofNumHeaderBytes = 0x11C;
constexpr int pofFooterOfst = 0x1000000; constexpr int pofFooterOfst = 0x1000000;
@ -1326,6 +1326,7 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
// print progress // print progress
printf("%d%%\r", (int)(((double)(dstFilePos) / srcSize) * 100)); printf("%d%%\r", (int)(((double)(dstFilePos) / srcSize) * 100));
fflush(stdout); fflush(stdout);
// pof: exit early to discard footer // pof: exit early to discard footer
if (isPof && dstFilePos >= pofFooterOfst) { if (isPof && dstFilePos >= pofFooterOfst) {
break; break;