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

ctb server: modified program fpag in case of errors

Browse Source
This commit is contained in:
maliakal_d
2019-02-21 15:56:51 +01:00
parent a4f1b7670f
commit 617f3d2600
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -63,7 +63,7 @@ void init_detector() {
#endif
if (isControlServer) {
basictests();
#ifdef JUNGFRAUD
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
if (debugflag != PROGRAMMING_MODE)
#endif
initControlServer();
@ -91,7 +91,7 @@ int decode_function(int file_des) {
FILE_LOG(logDEBUG3, ("Received %d bytes\n", n ));
// jungfrau in programming mode
#ifdef JUNGFRAUD
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
if ((debugflag == PROGRAMMING_MODE) &&
(fnum != F_PROGRAM_FPGA) &&
(fnum != F_GET_DETECTOR_TYPE) &&
@ -2096,7 +2096,7 @@ int set_port(int file_des) {
int update_client(int file_des) {
ret = FORCE_UPDATE;
memset(mess, 0, sizeof(mess));
#ifdef JUNGFRAUD
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
if (debugflag == PROGRAMMING_MODE) {
ret = OK;
}
@ -3099,7 +3099,7 @@ int program_fpga(int file_des) {
}
}
printf("\n");
FILE_LOG(logINFO, ("Done copying program\n"));
FILE_LOG(logINFO, ("Done copying program or due to failure earlier\n"));
// closing file pointer to flash and informing FPGA
stopWritingFPGAprogram(fp);
@ -3112,7 +3112,7 @@ int program_fpga(int file_des) {
FILE_LOG(logDEBUG1, ("Done with program receiving command\n"));
if (isControlServer) {
if (ret != FAIL && isControlServer) {
basictests();
initControlServer();
}