Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

This commit is contained in:
bergamaschi 2015-04-10 10:08:34 +02:00
commit 31f06fb567

View File

@ -600,8 +600,8 @@ char *readFrame(int *ret, char *mess){
if(!Feb_Control_WaitForFinishedFlag(5000))
printf("error in waiting for finished flag\n");
printf("Acquisition finished\n");
usleep(0);
//usleep(1000000);
//usleep(0);
usleep(1000000);
printf("*****Done Waiting...\n");
//}
*ret = (int)FINISHED;