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

wip

Browse Source
This commit is contained in:
maliakal_d 2021-09-03 08:12:59 +02:00
parent cf96545f60
commit c4caacd2ed
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3725,7 +3725,34 @@ int program_fpga(int file_des) {
return printSocketReadError(); return printSocketReadError();
LOG(logINFOBLUE, ("Program size is: %lld\n", LOG(logINFOBLUE, ("Program size is: %lld\n",
(long long unsigned int)filesize)); (long long unsigned int)filesize));
int fsize = filesize;
/*
// delete old /var/tmp/file
char cmd[MAX_STR_LENGTH] = {0};
memset(cmd, 0, MAX_STR_LENGTH);
sprintf(cmd, "rm -fr /var/tmp/tmp.pof");
char retvals[MAX_STR_LENGTH] = {0};
memset(retvals, 0, MAX_STR_LENGTH);
int success = executeCommand(cmd, retvals, logDEBUG1);
if (success == FAIL) {
ret = FAIL;
strcpy(mess, retvals);
// LOG(logERROR, (mess)); already printed in executecommand
} else {
memset(cmd, 0, MAX_STR_LENGTH);
sprintf(cmd, "free | grep Mem | cut -f 2");.// fix this
memset(retvals, 0, MAX_STR_LENGTH);
int success = executeCommand(cmd, retvals, logDEBUG1);
if (success == FAIL) {
ret = FAIL;
strcpy(mess, retvals);
// LOG(logERROR, (mess)); already printed in executecommand
}
}
Server_SendResult(file_des, INT32, NULL, 0);
*/
size_t fsize = filesize;
fpgasrc = malloc(fsize); fpgasrc = malloc(fsize);
if (fpgasrc == NULL) { if (fpgasrc == NULL) {
LOG(logERROR, ("Could not malloc\n")); LOG(logERROR, ("Could not malloc\n"));

10
slsDetectorSoftware/src/Module.cpp
View File

@ -3417,9 +3417,15 @@ void Module::programFPGAviaBlackfin(std::vector<char> buffer) {
auto client = DetectorSocket(shm()->hostname, shm()->controlPort); auto client = DetectorSocket(shm()->hostname, shm()->controlPort);
client.Send(F_PROGRAM_FPGA); client.Send(F_PROGRAM_FPGA);
client.Send(filesize); client.Send(filesize);
printf("%d%%\r", 0);
std::cout << std::flush;
// opening file fail
if (client.Receive<int>() == FAIL) {
std::cout << '\n';
std::ostringstream os;
os << "Detector " << moduleId << " (" << shm()->hostname << ")"
<< " returned error: " << client.readErrorMessage();
throw RuntimeError(os.str());
}
// sending program in parts of 2mb each // sending program in parts of 2mb each
uint64_t unitprogramsize = 0; uint64_t unitprogramsize = 0;