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

acquire works properly now

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-03-12 16:47:20 +01:00
parent 7e44648da9
commit 477b2fb467
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

13
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -537,8 +537,6 @@ int startStateMachine(){
while(getRunStatus() == IDLE); while(getRunStatus() == IDLE);
printf("*****Acquiring...\n"); printf("*****Acquiring...\n");
} }
/*else usleep(1000000); /*else usleep(1000000);
printf("****Returning\n");*/ printf("****Returning\n");*/
@ -598,10 +596,13 @@ enum runStatus getRunStatus(){
char *readFrame(int *ret, char *mess){ char *readFrame(int *ret, char *mess){
if(!Feb_Control_WaitForFinishedFlag(5000)) //if(master){
printf("error in waiting for finished flag\n"); if(!Feb_Control_WaitForFinishedFlag(5000))
printf("Acquisition finished\n"); printf("error in waiting for finished flag\n");
printf("Acquisition finished\n");
usleep(0);
printf("*****Done Waiting...\n");
//}
*ret = (int)FINISHED; *ret = (int)FINISHED;
return NULL; return NULL;
} }