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

gotthard2, removed .gdb, removed warnings

Browse Source
This commit is contained in:
maliakal_d
2019-08-30 18:08:16 +02:00
parent 9bc6c44e51
commit 4a112104ad
2 changed files with 116 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/gotthard2DetectorServer/Makefile
View File

@ -6,7 +6,7 @@ support_lib = ../../slsSupportLib/include/
CROSS = nios2-buildroot-linux-gnu- CROSS = nios2-buildroot-linux-gnu-
CC = $(CROSS)gcc CC = $(CROSS)gcc
CFLAGS += -Wall -DGOTTHARD2D -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir)#-DVERBOSEI #-DVERBOSE CFLAGS += -Wall -DGOTTHARD2D -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir)#-DVERBOSEI #-DVERBOSE
LDLIBS += -lm LDLIBS += -lm
PROGS = gotthard2DetectorServer PROGS = gotthard2DetectorServer
DESTDIR ?= bin DESTDIR ?= bin
INSTMODE = 0777 INSTMODE = 0777
@ -31,7 +31,6 @@ $(PROGS): $(OBJS)
mkdir -p $(DESTDIR) mkdir -p $(DESTDIR)
$(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS)
mv $(PROGS) $(DESTDIR) mv $(PROGS) $(DESTDIR)
rm *.gdb
rm $(main_src)*.o rm $(main_src)*.o
clean: clean:

161
slsDetectorServers/slsDetectorServer/src/communication_funcs.c
View File

@ -398,28 +398,60 @@ int receiveDataOnly(int file_des, void* buf,int length) {
int sendModule(int file_des, sls_detector_module *myMod) { int sendModule(int file_des, sls_detector_module *myMod) {
int ts = 0, n = 0; int ts = 0, n = 0;
n = sendData(file_des,&(myMod->serialnumber),sizeof(myMod->serialnumber),INT32); n = sendData(file_des,&(myMod->serialnumber),sizeof(myMod->serialnumber),INT32);
if (!n) return -1; ts += n; if (!n) {
n = sendData(file_des,&(myMod->nchan), sizeof(myMod->nchan), INT32); return -1;
if (!n) return -1; ts += n; }
n = sendData(file_des,&(myMod->nchip), sizeof(myMod->nchip), INT32); ts += n;
if (!n) return -1; ts += n; n = sendData(file_des, &(myMod->nchan), sizeof(myMod->nchan), INT32);
n = sendData(file_des,&(myMod->ndac), sizeof(myMod->ndac), INT32); if (!n) {
if (!n) return -1; ts += n; return -1;
n = sendData(file_des,&(myMod->reg), sizeof(myMod->reg), INT32); }
if (!n) return -1; ts += n; ts += n;
n = sendData(file_des,&(myMod->iodelay), sizeof(myMod->iodelay), INT32); n = sendData(file_des, &(myMod->nchip), sizeof(myMod->nchip), INT32);
if (!n) return -1; ts += n; if (!n) {
n = sendData(file_des,&(myMod->tau), sizeof(myMod->tau), INT32); return -1;
if (!n) return -1; ts += n; }
n = sendData(file_des,&(myMod->eV), sizeof(myMod->eV), INT32); ts += n;
if (!n) return -1; ts += n; n = sendData(file_des, &(myMod->ndac), sizeof(myMod->ndac), INT32);
// dacs if (!n) {
return -1;
}
ts += n;
n = sendData(file_des, &(myMod->reg), sizeof(myMod->reg), INT32);
if (!n) {
return -1;
}
ts += n;
n = sendData(file_des, &(myMod->iodelay), sizeof(myMod->iodelay),
INT32);
if (!n) {
return -1;
}
ts += n;
n = sendData(file_des, &(myMod->tau), sizeof(myMod->tau), INT32);
if (!n) {
return -1;
}
ts += n;
n = sendData(file_des, &(myMod->eV), sizeof(myMod->eV), INT32);
if (!n) {
return -1;
}
ts += n;
// dacs
n = sendData(file_des,myMod->dacs, sizeof(int)*(myMod->ndac), INT32); n = sendData(file_des,myMod->dacs, sizeof(int)*(myMod->ndac), INT32);
if (!n) return -1; ts += n; if (!n) {
return -1;
}
ts += n;
// channels // channels
#ifdef EIGERD #ifdef EIGERD
n = sendData(file_des,myMod->chanregs, sizeof(int) * (myMod->nchan), INT32); n = sendData(file_des, myMod->chanregs, sizeof(int) * (myMod->nchan),
if (!n) return -1; ts += n; INT32);
if (!n) {
return -1;
}
ts += n;
#endif #endif
FILE_LOG(logDEBUG1, ("module of size %d sent register %x\n", ts, myMod->reg)); FILE_LOG(logDEBUG1, ("module of size %d sent register %x\n", ts, myMod->reg));
return ts; return ts;
@ -437,37 +469,71 @@ int receiveModule(int file_des, sls_detector_module* myMod) {
FILE_LOG(level, ("nChans: %d\n",nChans)); FILE_LOG(level, ("nChans: %d\n",nChans));
#endif #endif
n = receiveData(file_des,&(myMod->serialnumber), sizeof(myMod->serialnumber), INT32); n = receiveData(file_des,&(myMod->serialnumber), sizeof(myMod->serialnumber), INT32);
if (!n) return -1; ts += n; if (!n) {
FILE_LOG(level, ("serialno received. %d bytes. serialno: %d\n", n, myMod->serialnumber)); return -1;
n = receiveData(file_des,&(myMod->nchan), sizeof(myMod->nchan), INT32); }
if (!n) return -1; ts += n; ts += n;
FILE_LOG(level, ("nchan received. %d bytes. nchan: %d\n", n, myMod->nchan)); FILE_LOG(level, ("serialno received. %d bytes. serialno: %d\n", n,
n = receiveData(file_des,&(myMod->nchip), sizeof(myMod->nchip), INT32); myMod->serialnumber));
if (!n) return -1; ts += n; n = receiveData(file_des, &(myMod->nchan), sizeof(myMod->nchan), INT32);
FILE_LOG(level, ("nchip received. %d bytes. nchip: %d\n", n, myMod->nchip)); if (!n) {
n = receiveData(file_des,&(myMod->ndac), sizeof(myMod->ndac), INT32); return -1;
if (!n) return -1; ts += n; }
FILE_LOG(level, ("ndac received. %d bytes. ndac: %d\n", n, myMod->ndac)); ts += n;
n = receiveData(file_des,&(myMod->reg), sizeof(myMod->reg), INT32); FILE_LOG(level,
if (!n) return -1; ts += n; ("nchan received. %d bytes. nchan: %d\n", n, myMod->nchan));
FILE_LOG(level, ("reg received. %d bytes. reg: %d\n", n, myMod->reg)); n = receiveData(file_des, &(myMod->nchip), sizeof(myMod->nchip), INT32);
n = receiveData(file_des,&(myMod->iodelay), sizeof(myMod->iodelay), INT32); if (!n) {
if (!n) return -1; ts += n; return -1;
FILE_LOG(level, ("iodelay received. %d bytes. iodelay: %d\n", n, myMod->iodelay)); }
n = receiveData(file_des,&(myMod->tau), sizeof(myMod->tau), INT32); ts += n;
if (!n) return -1; ts += n; FILE_LOG(level,
FILE_LOG(level, ("tau received. %d bytes. tau: %d\n", n, myMod->tau)); ("nchip received. %d bytes. nchip: %d\n", n, myMod->nchip));
n = receiveData(file_des,&(myMod->eV), sizeof(myMod->eV), INT32); n = receiveData(file_des, &(myMod->ndac), sizeof(myMod->ndac), INT32);
if (!n) return -1; ts += n; if (!n) {
FILE_LOG(level, ("eV received. %d bytes. eV: %d\n", n, myMod->eV)); return -1;
}
ts += n;
FILE_LOG(level,
("ndac received. %d bytes. ndac: %d\n", n, myMod->ndac));
n = receiveData(file_des, &(myMod->reg), sizeof(myMod->reg), INT32);
if (!n) {
return -1;
}
ts += n;
FILE_LOG(level, ("reg received. %d bytes. reg: %d\n", n, myMod->reg));
n = receiveData(file_des, &(myMod->iodelay), sizeof(myMod->iodelay),
INT32);
if (!n) {
return -1;
}
ts += n;
FILE_LOG(level, ("iodelay received. %d bytes. iodelay: %d\n", n,
myMod->iodelay));
n = receiveData(file_des, &(myMod->tau), sizeof(myMod->tau), INT32);
if (!n) {
return -1;
}
ts += n;
FILE_LOG(level, ("tau received. %d bytes. tau: %d\n", n, myMod->tau));
n = receiveData(file_des, &(myMod->eV), sizeof(myMod->eV), INT32);
if (!n) {
return -1;
}
ts += n;
FILE_LOG(level, ("eV received. %d bytes. eV: %d\n", n, myMod->eV));
// dacs // dacs
if (nDacs != (myMod->ndac)) { if (nDacs != (myMod->ndac)) {
FILE_LOG(logERROR, ("received wrong number of dacs. " FILE_LOG(logERROR, ("received wrong number of dacs. "
"Expected %d, got %d\n", nDacs, myMod->ndac)); "Expected %d, got %d\n",
nDacs, myMod->ndac));
return 0; return 0;
} }
n = receiveData(file_des, myMod->dacs, sizeof(int) * (myMod->ndac), INT32); n = receiveData(file_des, myMod->dacs, sizeof(int) * (myMod->ndac), INT32);
if (!n) return -1; ts += n; if (!n) {
return -1;
}
ts += n;
FILE_LOG(level, ("dacs received. %d bytes.\n", n)); FILE_LOG(level, ("dacs received. %d bytes.\n", n));
// channels // channels
#ifdef EIGERD #ifdef EIGERD
@ -479,7 +545,10 @@ int receiveModule(int file_des, sls_detector_module* myMod) {
} }
n = receiveData(file_des, myMod->chanregs, sizeof(int) * (myMod->nchan), INT32); n = receiveData(file_des, myMod->chanregs, sizeof(int) * (myMod->nchan), INT32);
FILE_LOG(level, ("chanregs received. %d bytes.\n", n)); FILE_LOG(level, ("chanregs received. %d bytes.\n", n));
if (!n) return -1; ts += n; if (!n){
return -1;
}
ts += n;
#endif #endif
FILE_LOG(level, ("received module of size %d register %x\n",ts,myMod->reg)); FILE_LOG(level, ("received module of size %d register %x\n",ts,myMod->reg));
return ts; return ts;