detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-25 15:50:03 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0-rc' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-10 19:09:58 +02:00
commit aca3b4ca1b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -1463,6 +1463,9 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action) {
return myDet->runStatusType(s); return myDet->runStatusType(s);
} }
else if (cmd=="busy") { else if (cmd=="busy") {
if (action==PUT_ACTION) {
return string ("cannot put");
}
char answer[100]; char answer[100];
sprintf(answer,"%d", myDet->getAcquiringFlag()); sprintf(answer,"%d", myDet->getAcquiringFlag());
return string(answer); return string(answer);