diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index c10ae39db..b33da46fb 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -3771,7 +3771,7 @@ int program_fpga(int file_des) { } // print progress LOG(logINFO, - ("\tCopying Program to /var/tmp/:%d%%\r", + ("\t%d%%\r", (int)(((double)(totalsize - filesize) / totalsize) * 100))); fflush(stdout); } diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index f2755bb2f..bd6a8927c 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -1303,7 +1303,7 @@ std::vector DetectorImpl::readProgrammingFile(const std::string &fname) { // convert src to dst rawbin 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 pofFooterOfst = 0x1000000; @@ -1326,6 +1326,7 @@ std::vector DetectorImpl::readProgrammingFile(const std::string &fname) { // print progress printf("%d%%\r", (int)(((double)(dstFilePos) / srcSize) * 100)); fflush(stdout); + // pof: exit early to discard footer if (isPof && dstFilePos >= pofFooterOfst) { break;