detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 17:58:05 +01:00
Code Issues Actions Packages Releases Activity

eigerhighlevel unsigned dac

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@774 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-03-13 12:54:03 +00:00
parent 1cd85e9e49
commit 4f4d8d4caf
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/eigerDetectorServer/EigerHighLevelFunctions.c
View File

@@ -18,8 +18,8 @@ char eiger_message[1024];
int eiger_message_length = 0; int eiger_message_length = 0;
int eiger_ret_val=0; int eiger_ret_val=0;
const unsigned int ndacs = 16; const int ndacs = 16;
const char* dac_names[16] = {"SvP","Vtr","Vrf","Vrs","SvN","Vtgstv","Vcmp_ll","Vcmp_lr","cal","Vcmp_rl","rxb_rb","rxb_lb","Vcmp_rr","Vcp","Vcn","Vis"}; const char* dac_names[16] = {"SvP","Vtr","Vrf","Vrs","SvN","Vtgstv","Vcmp_ll","Vcmp_lr","cal","Vcmp_rl","rxb_rb","rxb_lb","Vcmp_rr","Vcp","Vcn","Vis"};
int EigerInit(){ int EigerInit(){

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

5
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@@ -8,6 +8,7 @@
#include "slsDetectorFunctionList.h" #include "slsDetectorFunctionList.h"
#include "svnInfoEiger.h" #include "svnInfoEiger.h"
#include "Eiger.h" #include "Eiger.h"
#include "EigerHighLevelFunctions.c"
using namespace std; using namespace std;
@@ -225,7 +226,7 @@ int startStateMachine(){
now_ptr=(char*)ram_values; now_ptr=(char*)ram_values;
//send start acquisition to fpga //send start acquisition to fpga
*/ */
return FAIL; return OK;
} }
@@ -233,7 +234,7 @@ int stopStateMachine(){
//template stopStateMachine() from firmware_funcs.c //template stopStateMachine() from firmware_funcs.c
// send stop to fpga // send stop to fpga
//if status = busy after 500us, return FAIL //if status = busy after 500us, return FAIL
return FAIL; return OK;
} }