From 6d4e5aa1af05ecff0193112e61b7cbcb6d7ed04d Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Thu, 20 Jun 2013 08:46:47 +0000 Subject: [PATCH] eiger setting dac works now and setsettings.. need to work on trimbits git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@620 951219d9-93cf-4727-9268-0efd64621fa3 --- .../bin/eigerDetectorServer | Bin 64734 -> 64600 bytes .../slsDetectorFunctionList.c | 14 +++++++++----- .../slsDetectorServer_defs.h | 5 +++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index 645caadc8ff39aacd09c836c305ffe02d4d29275..34b92e4e90befbac111dd9932aa858bcdac00ef0 100755 GIT binary patch delta 16112 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 X1`hT4b5JjT$p2g>wXVDKUBLea6Xg5w diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index 9721d4077..9eb0dfcc2 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -1,7 +1,6 @@ #ifdef SLS_DETECTOR_FUNCTION_LIST #include "slsDetectorFunctionList.h" -#include "slsDetectorServer_defs.h" #include #include @@ -40,6 +39,7 @@ int sChan, sChip, sMod, sDac, sAdc; int nModBoard; extern int dataBytes; +int dacvalues[NDAC]; /** temporary u_int32_t CSP0BASE; @@ -221,17 +221,21 @@ int detectorTest( enum digitalTestMode arg){ -double setDAC(enum dacIndex ind, double val, int imod){ +int setDAC(enum detDacIndex ind, int val, int imod){ + + if (val >= 0) + dacvalues[(int)ind] = val; + //template initDACbyIndexDACU from mcb_funcs.c //check that slsDetectorServer_funcs.c set_dac() has all the specific dac enums //set dac and write to a register in fpga to remember dac value when server restarts - return 0; + return dacvalues[(int)ind]; } -double getADC(enum dacIndex ind, int imod){ +int getADC(enum detDacIndex ind, int imod){ //get adc value return 0; } @@ -263,7 +267,7 @@ int setThresholdEnergy(int thr, int imod){ -enum detectorSettings setSettings(enum detectorSettings sett, int imod){ +enum detDacIndex setSettings(enum detDacIndex sett, int imod){ //template setSettings() from mcb_funcs.c //reads the dac registers from fpga to confirm which settings, if weird, undefined diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h index a39c475b1..97891d70c 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h @@ -27,5 +27,10 @@ #define DYNAMIC_RANGE 16 +#ifdef EIGERD +enum detDacIndex{SVP,SVN,VTR,VRF,VRS,VTGSTV,VCMP_LL,VCMP_LR,CAL,VCMP_RL,VCMP_RR,RXB_RB,RXB_LB,VCP,VCN,VIS}; +#else +enum detDacIndex{none}; +#endif #endif /* SLSDETECTORSERVER_DEFS_H_ */