detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 15:00:02 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/ctbDetectorServer/Makefile
View File

@ -1,6 +1,6 @@
CROSS = bfin-uclinux- CROSS = bfin-uclinux-
CC = $(CROSS)gcc CC = $(CROSS)gcc
CFLAGS += -Wall -DCHIPTESTBOARDD -DSTOP_SERVER -DDEBUG1 #-DJCTB -DVERBOSEI #-DVERBOSE CFLAGS += -Wall -DCHIPTESTBOARDD -DSTOP_SERVER #-DDEBUG1 #-DJCTB -DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lstdc++ LDLIBS += -lm -lstdc++
PROGS = ctbDetectorServer PROGS = ctbDetectorServer
@ -28,4 +28,4 @@ clean:
rm -rf $(DESTDIR)/$(PROGS) *.o *.gdb rm -rf $(DESTDIR)/$(PROGS) *.o *.gdb

10
slsDetectorServers/ctbDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: c93f88b7e5afe231ec43c47d60278c6acdb520af Repsitory UUID: a4f1b7670f7a6e5bfae9f34f561350643eab6ca5
Revision: 19 Revision: 23
Branch: refactor Branch: ctbBugFixes
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4333 Last Changed Rev: 4340
Last Changed Date: 2019-02-20 08:12:50.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2019-02-21 11:22:00.000000002 +0100 ./Makefile

8
slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "c93f88b7e5afe231ec43c47d60278c6acdb520af" #define GITREPUUID "a4f1b7670f7a6e5bfae9f34f561350643eab6ca5"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4333 #define GITREV 0x4340
#define GITDATE 0x20190220 #define GITDATE 0x20190221
#define GITBRANCH "refactor" #define GITBRANCH "ctbBugFixes"

2
slsDetectorServers/slsDetectorServer/slsDetectorServer.c
View File

@ -63,7 +63,7 @@ int main(int argc, char *argv[]){
FILE_LOG(logINFO, ("Detected phase shift of %d\n", phaseShift)); FILE_LOG(logINFO, ("Detected phase shift of %d\n", phaseShift));
} }
#endif #endif
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) #if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
else if(!strcasecmp(argv[i],"-update")){ else if(!strcasecmp(argv[i],"-update")){
FILE_LOG(logINFO, ("Detected update mode\n")); FILE_LOG(logINFO, ("Detected update mode\n"));
debugflag = PROGRAMMING_MODE; debugflag = PROGRAMMING_MODE;

10
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

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