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

acquire works with receiver now

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@324 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-10-29 17:00:53 +00:00
parent 30e6c810a8
commit f37cd6640f
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -1445,8 +1445,12 @@ int configureMAC(int ipad,long long int macad,long long int servermacad,int ival
u_int32_t runBusy(void) {
return (bus_r(STATUS_REG)&RUN_BUSY_BIT);
u_int32_t s = bus_r(STATUS_REG);
//s=((s & RUN_BUSY_BIT) | (s & READMACHINE_BUSY_BIT));
//s=(s & RUN_BUSY_BIT);
//if(s!=0x62721)
// printf("status=%x\n",s);
return s;
}
u_int32_t dataPresent(void) {
@ -1618,8 +1622,10 @@ u_int32_t* fifo_read_event()
while ((t&0x1)==0)
{
t = bus_r(LOOK_AT_ME_REG);
if (!runBusy())
return NULL;
if (!runBusy()){
printf("\n\ngonna return null STATUS=%08x\n",runState());
return NULL;
}
}

3
slsDetectorSoftware/gotthardDetectorServer/server_defs.h
View File

@ -35,7 +35,8 @@
#define ADCSYNC_VAL 0x32213
#define ADCSYNC_VAL 0x32113
//#define ADCSYNC_VAL 0x22113
#ifdef VIRTUAL

2
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -1939,7 +1939,7 @@ int read_frame(int file_des) {
return OK;
} else {
//might add delay????
if(getFrames()>-2) {
if(getFrames()>-2) {printf("in hereeee: frames:%d\n",getFrames());
dataret=FAIL;
sprintf(mess,"no data and run stopped: %d frames left\n",(int)(getFrames()+2));
printf("%s\n",mess);