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

fixed error with cleaning fifo

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@316 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-10-26 10:21:09 +00:00
parent 8387f70071
commit db249237c9
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -256,13 +256,17 @@ int setDAQRegister(int adcval)
reg=bus_r(addr); reg=bus_r(addr);
bus_w(addr,val); bus_w(addr,val);
reg=bus_r(addr); reg=bus_r(addr);
//#ifdef VERBOSE #ifdef VERBOSE
printf("DAQ reg:%x\n",reg); printf("DAQ reg:%x\n",reg);
//#endif #endif
//clean fifo
addr=ADC_SYNC_REG; addr=ADC_SYNC_REG;
val=12; val=ADCSYNC_VAL | ADCSYNC_CLEAN_FIFO_BITS;
bus_w(addr,val);
val=ADCSYNC_VAL;
bus_w(addr,val); bus_w(addr,val);
reg=bus_r(addr); reg=bus_r(addr);
#ifdef VERBOSE #ifdef VERBOSE

4
slsDetectorSoftware/gotthardDetectorServer/registers_g.h
View File

@ -276,5 +276,9 @@
#define CHANNEL_OFFSET 16 #define CHANNEL_OFFSET 16
#define ACTIVE_ADC_MASK 0x0000001f #define ACTIVE_ADC_MASK 0x0000001f
/**ADC SYNC CLEAN FIFO*/
#define ADCSYNC_CLEAN_FIFO_BITS 0x300000
#endif #endif

5
slsDetectorSoftware/gotthardDetectorServer/server_defs.h
View File

@ -33,6 +33,11 @@
#define ALLMOD 0xffff #define ALLMOD 0xffff
#define ALLFIFO 0xffff #define ALLFIFO 0xffff
#define ADCSYNC_VAL 0x32213
#ifdef VIRTUAL #ifdef VIRTUAL
#define DEBUGOUT #define DEBUGOUT
#endif #endif