detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +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
Show Stats 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); reg=bus_r(addr);
#ifdef DDEBUG #ifdef DDEBUG
printf("\nADC SYNC reg:%d\n",reg); printf("\nADC SYNC reg:%x\n",reg);
#endif #endif
return OK; 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){ 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 //setting adc mask
int reg; int reg;
int udpPacketSize=0x050E; 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 #ifdef DDEBUG
printf("Chip of Intrst Reg:%x\n",bus_r(CHIP_OF_INTRST_REG)); printf("Chip of Intrst Reg:%x\n",bus_r(CHIP_OF_INTRST_REG));
printf("IP Packet Size:%d\n",ipPacketSize); printf("IP Packet Size:%d\n",ipPacketSize);

7
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -2600,8 +2600,11 @@ int configure_mac(int file_des) {
printf("Configuring MAC of module %d and adc %d at port %x\n", imod, adc,udpport); printf("Configuring MAC of module %d and adc %d at port %x\n", imod, adc,udpport);
//#endif //#endif
#ifdef MCB_FUNCS #ifdef MCB_FUNCS
if (ret==OK) if (ret==OK){
configureMAC(ipad,imacadd,idetectormacadd,detipad,digitalTestBit,adc,udpport); ret=configureMAC(ipad,imacadd,idetectormacadd,detipad,digitalTestBit,adc,udpport);
if(ret==FAIL)
strcpy(mess,"could not stop detector acquisition to configure mac");
}
#endif #endif
if (ret==FAIL) if (ret==FAIL)
printf("configuring MAC of mod %d failed\n", imod); printf("configuring MAC of mod %d failed\n", imod);