linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed disabling of status checking in Paused mode (not appropriate for ANSTO histogram server)

Browse Source 
r1195 | mle | 2006-10-26 12:21:18 +1000 (Thu, 26 Oct 2006) | 2 lines
This commit is contained in:
Mark Lesha
2006-10-26 12:21:18 +10:00
committed by Douglas Clowes
parent dd864f8813
commit 4a74ec3404
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
site_ansto/anstohttp.c
View File

@@ -402,9 +402,12 @@ static int AnstoHttpStatus(pHistDriver self,SConnection *pCon){
pPriv = (pAnstoHttp)self->pPriv; pPriv = (pAnstoHttp)self->pPriv;
assert(pPriv != NULL); assert(pPriv != NULL);
if(pPriv->pause == 1){ // MJL for the ANSTO histogram server we need status checking to occur
return HWPause; // even when in paused mode (our pause mode has a different functionality).
} // So the code below is removed.
/// if(pPriv->pause == 1){
/// return HWPause;
/// }
if(pPriv->asyncRunning == 0){ if(pPriv->asyncRunning == 0){
status = anstoHttpGetPrepare(pPriv,statusdaq); status = anstoHttpGetPrepare(pPriv,statusdaq);
@@ -447,10 +450,6 @@ static int AnstoHttpStatus(pHistDriver self,SConnection *pCon){
return HWFault; return HWFault;
} }
// TO BE REMOVED!!!
// MJL DEBUG
//return HWIdle;
if(StringDictGet(self->pOption,"daq",daqStatus,20) != 1){ if(StringDictGet(self->pOption,"daq",daqStatus,20) != 1){
///SCWrite(pCon,"Field 'daq' not found!!!",eError); // MJL DEBUG ///SCWrite(pCon,"Field 'daq' not found!!!",eError); // MJL DEBUG
pPriv->errorCode = BADSTATUS; pPriv->errorCode = BADSTATUS;