detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-06 18:10:40 +02:00
Code Issues Actions Packages Releases Activity

changed adc_sync to be read first before editing to clean fifo

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@544 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-05-07 07:34:36 +00:00
parent 3ac133db98
commit f29358992d
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/moenchDetectorServer/firmware_funcs.c
View File

@ -261,20 +261,25 @@ int cleanFifo(){
printf("Cleaning FIFO\n"); printf("Cleaning FIFO\n");
addr=ADC_SYNC_REG; addr=ADC_SYNC_REG;
reg = bus_r(addr) & CLEAN_FIFO_MASK;
//only for start up
if(!reg) reg = ADCSYNC_VAL;
//88 3 32214 //88 3 32214
if (ROI_flag==0) { if (ROI_flag==0) {
val=ADCSYNC_VAL | ADCSYNC_CLEAN_FIFO_BITS | TOKEN_RESTART_DELAY; val=reg | ADCSYNC_CLEAN_FIFO_BITS | TOKEN_RESTART_DELAY;
bus_w(addr,val); bus_w(addr,val);
//88032214 //88032214
val=ADCSYNC_VAL | TOKEN_RESTART_DELAY; val=reg | TOKEN_RESTART_DELAY;
bus_w(addr,val); bus_w(addr,val);
} }
else { else {
//1b332214 //1b332214
val=ADCSYNC_VAL | ADCSYNC_CLEAN_FIFO_BITS | TOKEN_RESTART_DELAY_ROI; val=reg | ADCSYNC_CLEAN_FIFO_BITS | TOKEN_RESTART_DELAY_ROI;
bus_w(addr,val); bus_w(addr,val);
//1b032214 //1b032214
val=ADCSYNC_VAL | TOKEN_RESTART_DELAY_ROI; val=reg | TOKEN_RESTART_DELAY_ROI;
bus_w(addr,val); bus_w(addr,val);
} }

BIN
slsDetectorSoftware/moenchDetectorServer/moenchDetectorServer
View File

Binary file not shown.

2
slsDetectorSoftware/moenchDetectorServer/server_funcs.c
View File

@ -86,7 +86,7 @@ int init_detector(int b, int checkType) {
#endif #endif
testFpga(); testFpga();
testRAM(); testRAM();
printf("ADC_SYNC_REG:%x\n",bus_r(ADC_SYNC_REG));
//moench specific //moench specific
setPhaseShiftOnce(); setPhaseShiftOnce();
prepareADC(); prepareADC();