- made fixes to hkl
- Introduced a help system - introduced a module for handling automatic updates of files during long measurements - Added a circular buffer and handling facilities to varlog - Upgraded documentation SKIPPED: psi/faverage.h psi/nxamor.tex psi/pimotor.h psi/pimotor.tex
This commit is contained in:
14
counter.c
14
counter.c
@ -104,6 +104,7 @@
|
||||
{
|
||||
self->isUpToDate = 0;
|
||||
self->tStart = time(&tX);
|
||||
InvokeCallBack(self->pCall,COUNTSTART,pCon);
|
||||
return iRet;
|
||||
}
|
||||
else
|
||||
@ -231,6 +232,7 @@
|
||||
{
|
||||
SCWrite(pCon,"ERROR: Cannot fix counter problem, aborting",eError);
|
||||
SCSetInterrupt(pCon,eAbortBatch);
|
||||
InvokeCallBack(self->pCall,COUNTEND,NULL);
|
||||
return eCt;
|
||||
}
|
||||
else
|
||||
@ -238,6 +240,10 @@
|
||||
return HWBusy;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
handle count parameters and notify listeners on progress
|
||||
*/
|
||||
sMon.fCurrent = fControl;
|
||||
sMon.fPreset = self->pDriv->fPreset;
|
||||
sMon.pName = self->name;
|
||||
@ -251,6 +257,14 @@
|
||||
self->iCallbackCounter++;
|
||||
}
|
||||
self->pDriv->fLastCurrent = fControl;
|
||||
|
||||
/*
|
||||
notification on finish
|
||||
*/
|
||||
if(eCt == HWIdle)
|
||||
{
|
||||
InvokeCallBack(self->pCall,COUNTEND,NULL);
|
||||
}
|
||||
return eCt;
|
||||
}
|
||||
/*------------------------------------------------------------------------*/
|
||||
|
Reference in New Issue
Block a user