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

changes of get detector status by Anna-with error message

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@310 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-10-24 08:12:42 +00:00
parent e577cd369e
commit da5759bed6
1 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -1865,14 +1865,14 @@ int get_run_status(int file_des) {
} }
//and readbusy=0,idle //and readbusy=0,idle
else if(retval==0){ else if(!(retval&0xffff)){
//if(!(retval&0x00000001)){ //if(!(retval&0x00000001)){
printf("-----------------------------------IDLE--------------------------------------\n"); printf("-----------------------------------IDLE--------------------------------------\n");
s=IDLE; s=IDLE;
} else { } else {
printf("-----------------------------------Unknown status %04x--------------------------------------\n", retval); printf("-----------------------------------Unknown status %08x--------------------------------------\n", retval);
s=ERROR; s=ERROR;
ret=FAIL;
} }
} }
//if runbusy=1 //if runbusy=1
@ -1890,27 +1890,10 @@ int get_run_status(int file_des) {
/*
if (retval&0x8000)
s=ERROR;
else if (retval&0x00000001)
//if (retval&0x00010000)
if (retval&0x00000002)
s=TRANSMITTING;
else
s=RUNNING;
else if (retval&0x00010000)
s=RUN_FINISHED;
else if (retval&0x00000008)
s=WAITING;
else
s=IDLE;
*/
if (ret!=OK) { if (ret!=OK) {
printf("get status failed\n"); printf("get status failed %04x\n");
sprintf(mess, "get status failed %08x\n", retval);
} else if (differentClients) } else if (differentClients)
ret=FORCE_UPDATE; ret=FORCE_UPDATE;