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

binaries in

Browse Source
This commit is contained in:
maliakal_d
2021-09-14 16:01:05 +02:00
parent d599d75e0b
commit fdd8b52ce1
10 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c
View File

@ -78,6 +78,7 @@ int deleteOldFile(char *mess) {
LOG(logERROR, (mess));
return FAIL;
}
LOG(logINFO, ("\tDeleted old programming file (%s)\n", TEMP_PROG_FILE_NAME));
return OK;
}
@ -139,11 +140,12 @@ int copyToFlash(ssize_t fsize, char *clientChecksum, char *mess) {
return FAIL;
}
/* ignoring this until a consistent way to read from bfin flash
if (verifyChecksumFromFlash(mess, clientChecksum, flashDriveName, fsize) ==
FAIL) {
return FAIL;
}
*/
if (waitForFPGAtoTouchFlash(mess) == FAIL) {
return FAIL;
}
@ -312,7 +314,7 @@ int waitForFPGAtoTouchFlash(char* mess) {
#ifdef VIRTUAL
return OK;
#endif
LOG(logINFO, ("Waiting for FPGA to program from flash\n"));
LOG(logINFO, ("\tWaiting for FPGA to program from flash\n"));
int timeSpent = 0;
int result = 0;
@ -339,9 +341,11 @@ int waitForFPGAtoTouchFlash(char* mess) {
}
// convert to int
if (sscanf(retvals, "%d", &result) != 1) {
sprintf(mess, "Could not program fpga. (could not scan int for gpio status: %s)\n",
retvals);
result = 1;
int retval = sscanf(retvals, "%d\n", &result);
if (retval != 1) {
sprintf(mess, "Could not program fpga. (could not scan int for gpio status: [%s] retval:%d, result:%d)\n",
retvals, retval, result);
LOG(logERROR, (mess));
return FAIL;
}

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

@ -445,11 +445,13 @@ int executeCommand(char *command, char *result, enum TLogLevel level) {
memset(temp, 0, tempsize);
memset(result, 0, MAX_STR_LENGTH);
LOG(level, ("Executing command:\n[%s]\n", command));
strcat(command, " 2>&1");
// copy command
char cmd[MAX_STR_LENGTH]= {0};
sprintf(cmd, "%s 2>&1", command);
LOG(level, ("Executing command:\n[%s]\n", cmd));
fflush(stdout);
FILE *sysFile = popen(command, "r");
FILE *sysFile = popen(cmd, "r");
while (fgets(temp, tempsize, sysFile) != NULL) {
// size left excludes terminating character
size_t sizeleft = MAX_STR_LENGTH - strlen(result) - 1;