- added backwards calculation of hkl from four circle angles. This
required inclusion of a matrix package. - modified counter error handling to send a Stop when the _BAD_BUSY error is received. - added an environment interface to the general controller stuff in choco.* Also added setting a parameter directly at the controller object. - Added a driver for the ETH High Temperature Furnace to be used at SANS.
This commit is contained in:
11
counter.c
11
counter.c
@ -233,7 +233,15 @@
|
||||
sMon.fCurrent = fControl;
|
||||
sMon.fPreset = self->pDriv->fPreset;
|
||||
sMon.pName = self->name;
|
||||
InvokeCallBack(self->pCall,MONITOR,&sMon);
|
||||
if(self->iCallbackCounter > 20)
|
||||
{
|
||||
InvokeCallBack(self->pCall,MONITOR,&sMon);
|
||||
self->iCallbackCounter = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
self->iCallbackCounter++;
|
||||
}
|
||||
self->pDriv->fLastCurrent = fControl;
|
||||
return eCt;
|
||||
}
|
||||
@ -357,6 +365,7 @@
|
||||
pRes->pCountInt->Halt = Halt;
|
||||
pRes->pCountInt->Pause = PauseCount;
|
||||
pRes->pCountInt->Continue = ContinueCount;
|
||||
pRes->iCallbackCounter = 20;
|
||||
|
||||
pRes->pCall = CreateCallBackInterface();
|
||||
|
||||
|
Reference in New Issue
Block a user