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

fixed clean fifo roi_flag error(being set after cleanfifo called)

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@433 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-01-22 10:23:53 +00:00
parent 47a9d34991
commit 3be74327f3
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -262,7 +262,7 @@ int cleanFifo(){
}
reg=bus_r(addr);
#ifdef DDEBUG
printf("\nADC SYNC reg:%d\n",reg);
printf("\nADC SYNC reg:%x\n",reg);
#endif
return OK;
}
@ -1177,8 +1177,12 @@ int initConfGain(int isettings,int val,int imod){
int configureMAC(int ipad,long long int macad,long long int detectormacad, int detipad, int ival, int adc,int udpport){
//setting daqregister
setDAQRegister(adc);
if(runBusy())
if(stopStateMachine()==FAIL)
return FAIL;
//setting adc mask
int reg;
int udpPacketSize=0x050E;
@ -1209,6 +1213,9 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
}
//setting daqregister
setDAQRegister(adc);
#ifdef DDEBUG
printf("Chip of Intrst Reg:%x\n",bus_r(CHIP_OF_INTRST_REG));
printf("IP Packet Size:%d\n",ipPacketSize);