SICS-664: statemon reports STARTED = histmem but doesn't report FINISH.
Removed the started message, we get enough feedback from the HistogramMemory.
This commit is contained in:
@@ -26,7 +26,6 @@
|
||||
#include <HistMem.i>
|
||||
|
||||
extern char *trim(char *);
|
||||
extern pICallBack statemon_cbinterface;
|
||||
int ANSTO_HTTP_PAUSE = 0;
|
||||
int AnstoHttpPause(pHistDriver self,SConnection *pCon);
|
||||
/*===================================================================
|
||||
@@ -460,14 +459,12 @@ static int AnstoHttpStatus_Base(pHistDriver self,SConnection *pCon,int *pextrast
|
||||
pInternal = (pAnstoHttp) self->pPriv;
|
||||
if(strstr(daqStatus,"Started") != NULL){
|
||||
if (last_known_status != HWBusy)
|
||||
InvokeCallBack(statemon_cbinterface, STSTART, devName);
|
||||
if (pextrastatus) *pextrastatus=ANSTO_HS_STATUS_STARTED;
|
||||
return last_known_status=HWBusy;
|
||||
} else if(strstr(daqStatus,"Paused") != NULL){
|
||||
if (pextrastatus) *pextrastatus=ANSTO_HS_STATUS_PAUSED;
|
||||
return last_known_status=HWIdle;
|
||||
} else if(strstr(daqStatus,"Stopped") != NULL){
|
||||
InvokeCallBack(statemon_cbinterface, STEND, devName);
|
||||
if (pextrastatus) *pextrastatus=ANSTO_HS_STATUS_STOPPED;
|
||||
return last_known_status=HWIdle;
|
||||
//
|
||||
@@ -616,7 +613,6 @@ static int AnstoHttpVeto(pHistDriver self,SConnection *pCon)
|
||||
pPriv->pause = 1;
|
||||
|
||||
AnstoHttpStatusWithRetries(self,ANSTO_HS_STATUS_PAUSED,pCon);
|
||||
InvokeCallBack(statemon_cbinterface, STPAUSE, devName);
|
||||
|
||||
return OKOK;
|
||||
}
|
||||
@@ -634,7 +630,6 @@ static int AnstoHttpNoVeto(pHistDriver self,SConnection *pCon)
|
||||
}
|
||||
pPriv->pause = 0;
|
||||
AnstoHttpStatusWithRetries(self,ANSTO_HS_STATUS_STARTED,pCon);
|
||||
InvokeCallBack(statemon_cbinterface, STCONTINUE, devName);
|
||||
return OKOK;
|
||||
}
|
||||
int AnstoHttpPause(pHistDriver self,SConnection *pCon){
|
||||
|
||||
Reference in New Issue
Block a user