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

fix for flash

Browse Source
This commit is contained in:
maliakal_d
2021-09-10 13:25:17 +02:00
parent 9d30d51da7
commit b8086dcd70
5 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -1241,7 +1241,7 @@ int DetectorImpl::kbhit() {
}
std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
/* // validate type of file
// validate type of file
bool isPof = false;
switch (multi_shm()->multiDetectorType) {
case JUNGFRAU:
@ -1353,9 +1353,6 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
throw RuntimeError(
"Could not convert programming file. EOF before end of flash");
}
// write 0 to tthe end
char c = '\0';
write(dst, &c, 1);
}
if (fclose(src) != 0) {
throw RuntimeError("Program FPGA: Could not close source file");
@ -1364,9 +1361,9 @@ std::vector<char> DetectorImpl::readProgrammingFile(const std::string &fname) {
throw RuntimeError("Program FPGA: Could not close destination file");
}
LOG(logINFOBLUE) << "File has been converted to " << destfname;
*/
// loading dst file to memory
FILE *fp = fopen("/tmp/SLS_DET_MCB.ZpfQln", "r");//
FILE *fp = fopen(destfname, "r");
if (fp == nullptr) {
throw RuntimeError("Program FPGA: Could not open rawbin file");
}