From 036d72fec8eafb2954a5e856034f74fffd74d869 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Thu, 11 Jul 2013 09:06:37 +0000 Subject: [PATCH] eiger server edited to include set timer, settingsand stop server for the time being git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@631 951219d9-93cf-4727-9268-0efd64621fa3 --- .../eigerDetectorServer/Makefile | 2 +- .../bin/eigerDetectorServer | Bin 65003 -> 65515 bytes .../slsDetectorFunctionList.c | 58 ++++++++++++++---- .../slsDetectorServer_defs.h | 2 +- .../slsDetector/slsDetector.cpp | 2 +- .../slsDetectorServer_funcs.c | 38 ++++++------ 6 files changed, 66 insertions(+), 36 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/Makefile b/slsDetectorSoftware/eigerDetectorServer/Makefile index 5e72413c5..649cb7c86 100644 --- a/slsDetectorSoftware/eigerDetectorServer/Makefile +++ b/slsDetectorSoftware/eigerDetectorServer/Makefile @@ -1,6 +1,6 @@ CC = powerpc-4xx-softfloat-gcc CCX = powerpc-4xx-softfloat-g++ -CLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT #-DVERBOSE #-DVIRTUAL +CLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DSTOP_SERVER #-DVERBOSE #-DVIRTUAL LDLIBS += -lm -lstdc++ PROGS = eigerDetectorServer diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index 5c07c24983de8d17d62b958b04849ce29b2ee79a..4edbb70d8bf7f78a2ad9b85eb5c23d81dbb2131f 100755 GIT binary patch delta 20382 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 delta 19573 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 E4= 0) + framenum = val; + return framenum; + case ACQUISITION_TIME: + if(val >= 0) + exposureTime = val; + return exposureTime; + case FRAME_PERIOD: + if(val >= 0) + period = val; + return period; + case DELAY_AFTER_TRIGGER: + if(val >= 0) + delay = val; + return delay; + case GATES_NUMBER: + if(val >= 0) + gates = val; + return gates; +/* case PROBES_NUMBER: + if(val >= 0) + framenum = val; + return framenum;*/ + case CYCLES_NUMBER: + if(val >= 0) + trains = val; + return trains; + default: + printf("unknown timer index: %d\n",ind); + break; + } + return -1; } @@ -414,7 +446,7 @@ int64_t getTimeLeft(enum timerIndex ind){ int setDynamicRange(int dr){ //template setDynamicRange() from firmware_funcs.c - return 0; + return DYNAMIC_RANGE; } diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h index a967913d7..816d2543f 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h @@ -14,7 +14,7 @@ #define GOODBYE -200 -#define MODULESERIALNUM 0xbeb045 //temporary should be in firmware + #define FIRMWAREREV 0xcaba //temporary should be in firmware /* examples*/ diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index c37d1e7e1..e92ba0d62 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -3054,7 +3054,7 @@ int slsDetector::updateDetectorNoWait() { thisDetector->timerValue[GATES_NUMBER]=retval; //retval=setProbes(tns); - if((thisDetector->myDetectorType!= GOTTHARD)&&(thisDetector->myDetectorType!= MOENCH)){ + if (thisDetector->myDetectorType == MYTHEN){ n = controlSocket->ReceiveDataOnly( &retval,sizeof(int64_t)); thisDetector->timerValue[PROBES_NUMBER]=retval; } diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 4ac6396a6..2c83e7204 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -362,37 +362,36 @@ int send_update(int file_des) { int ret=OK; enum detectorSettings t; - int thr, n = 0; - // int it; - int64_t retval;/*, tns=-1;*/ - int nm; - + int n = 0, nm = 0; + int64_t retval = 0; n += sendData(file_des,lastClientIP,sizeof(lastClientIP),OTHER); - /*nm=setNMod(-1,X);*/ + nm=setNMod(GET_FLAG,X); n += sendData(file_des,&nm,sizeof(nm),INT32); - /*nm=setNMod(-1,Y);*/ + nm=setNMod(GET_FLAG,Y); n += sendData(file_des,&nm,sizeof(nm),INT32); - /*nm=setDynamicRange(-1);*/ + nm=setDynamicRange(GET_FLAG); n += sendData(file_des,&nm,sizeof(nm),INT32); n += sendData(file_des,&dataBytes,sizeof(dataBytes),INT32); - /*t=setSettings(GET_SETTINGS, -1);*/ + + t=setSettings(GET_SETTINGS, GET_FLAG); n += sendData(file_des,&t,sizeof(t),INT32); - /*thr=getThresholdEnergy(-1);*/ - n += sendData(file_des,&thr,sizeof(thr),INT32); - /*retval=setFrames(tns);*/ + nm=getThresholdEnergy(GET_FLAG); + n += sendData(file_des,&nm,sizeof(nm),INT32); + + retval=setTimer(FRAME_NUMBER,GET_FLAG); n += sendData(file_des,&retval,sizeof(int64_t),INT64); - /*retval=setExposureTime(tns);*/ + retval=setTimer(ACQUISITION_TIME,GET_FLAG); n += sendData(file_des,&retval,sizeof(int64_t),INT64); - /*retval=setPeriod(tns);*/ + retval=setTimer(FRAME_PERIOD,GET_FLAG); n += sendData(file_des,&retval,sizeof(int64_t),INT64); - /*retval=setDelay(tns);*/ + retval=setTimer(DELAY_AFTER_TRIGGER,GET_FLAG); n += sendData(file_des,&retval,sizeof(int64_t),INT64); - /*retval=setGates(tns);*/ + retval=setTimer(GATES_NUMBER,GET_FLAG); n += sendData(file_des,&retval,sizeof(int64_t),INT64); - /*retval=setProbes(tns);*/ - n += sendData(file_des,&retval,sizeof(int64_t),INT64); - /*retval=setTrains(tns);*/ +/* retval=setTimer(PROBES_NUMBER,GET_FLAG); + n += sendData(file_des,&retval,sizeof(int64_t),INT64);*/ + retval=setTimer(CYCLES_NUMBER,GET_FLAG); n += sendData(file_des,&retval,sizeof(int64_t),INT64); if (lockStatus==0) { @@ -401,7 +400,6 @@ int send_update(int file_des) { return ret; - }