- fixed a bug in pause handling of environment controller.

- added code to triple axis MAD emulation layer
This commit is contained in:
cvs
2000-12-21 07:55:04 +00:00
parent 513e2701f0
commit d3b8f38ced
15 changed files with 399 additions and 24 deletions

View File

@ -62,6 +62,7 @@
#include "el755driv.h"
#include "tecsdriv.h"
#include "chadapter.h"
#include "status.h"
/*--------------------- Functions needed to implement interfaces -----------*/
static long EVIDrive(void *pData, SConnection *pCon, float fVal)
{
@ -339,7 +340,6 @@
self = (pEVControl)pData;
assert(self);
self->pDriv->GetValue(self->pDriv,&fPos);
sprintf(pBueffel,"WARNING: %s is out of range by %f",self->pName,
self->fTarget - fPos);
@ -367,14 +367,14 @@
/* wait till OK */
iRet = 0;
while(iRet == 0)
while(iRet == 0 && IsCounting(pExe) )
{
SicsWait(5);
iRet = self->pEnvir->IsInTolerance(self);
}
/* OK now, continue */
SetStatus(eEager);
ContinueExecution(pExe);
return 1;
}