From af22e53a16730caab4baa65681ab1c324bfbf216 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Thu, 20 Jun 2013 09:25:21 +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@621 951219d9-93cf-4727-9268-0efd64621fa3 --- .../bin/eigerDetectorServer | Bin 64600 -> 64689 bytes .../slsDetectorFunctionList.c | 25 +++++++++++++++--- .../slsDetectorFunctionList.h | 4 +-- .../slsDetectorServer_funcs.c | 2 +- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index 34b92e4e90befbac111dd9932aa858bcdac00ef0..2a00b4ab09d9024c2625be732238ebe8a8ec7411 100755 GIT binary patch delta 15998 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 delta 15797 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 QopOJ8cxUqe`<3bc0}h%V)Bpeg diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index 9eb0dfcc2..4e09334df 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -39,6 +39,8 @@ int sChan, sChip, sMod, sDac, sAdc; int nModBoard; extern int dataBytes; + +const char* dacNames[16] = {"Svp","Svn","Vtr","Vrf","Vrs","Vtgstv","Vcmp_ll","Vcmp_lr","Cal","Vcmp_rl","Vcmp_rr","Rxb_rb","Rxb_lb","Vcp","Vcn","Vis"}; int dacvalues[NDAC]; /** temporary @@ -222,7 +224,9 @@ int detectorTest( enum digitalTestMode arg){ int setDAC(enum detDacIndex ind, int val, int imod){ - +//#ifdef VERBOSE + printf("Setting dac %d: %s to %d mV\n",ind, dacNames[(int)ind],val); +//#endif if (val >= 0) dacvalues[(int)ind] = val; @@ -242,12 +246,25 @@ int getADC(enum detDacIndex ind, int imod){ -int setModule(sls_detector_module myChan){ - //template initModulebyNumber() from mcb_funcs.c +int setModule(sls_detector_module myMod){ +#ifdef VERBOSE + printf("Setting module\n"); +#endif + + //int nchip = myMod.nchip; + //int nchan = (myMod.nchan)/nchip; + int i; + + for(i=0;i