- Fixed a bug in conman.c which could cause a core dump when terminating

a connection during an active run.
- Added an additional output mode for the connection in order to
  support the batch run editor.
- Made clientput send everything with eWarning mode in order to support
  the batch run editor.
- Added a better NetReadTillTerm
- Fixed a problem in synchronize.c
- Fixed an issue with reading empty line on normal connection sockets.
- Added a psi scan mode to mesure.c for TRICS
- Made motor print warnings when trying to reposition.
- Fixed abug in hkl.c which cause wrong signs.


SKIPPED:
	psi/el734driv.c
	psi/el734hp.c
	psi/el737driv.c
	psi/el737hpdriv.c
	psi/nextrics.c
	psi/nxamor.c
	psi/psi.c
	psi/slsmagnet.c
	psi/swmotor2.c
	psi/tasscan.c
	psi/tasutil.c
This commit is contained in:
cvs
2004-07-21 12:03:06 +00:00
parent 6bfeac8c02
commit a55d2f0f7f
41 changed files with 823 additions and 372 deletions

View File

@ -365,9 +365,13 @@ static void ErrReport(pEVControl self)
char pBueffel[256];
self->pDriv->GetValues(self->pDriv,&self->fTarget,&fPos,&fDelta);
sprintf(pBueffel,"WARNING: %s is out of range by %g",self->pName,fDelta);
ErrWrite(pBueffel);
self->iWarned = 1;
if(self->iWarned == 0)
{
sprintf(pBueffel,"WARNING: %s is out of range by %g",
self->pName,fDelta);
ErrWrite(pBueffel);
self->iWarned = 1;
}
}
/*-------------------------------------------------------------------------*/
static int ErrLazy(void *pData)
@ -408,6 +412,7 @@ static void ErrReport(pEVControl self)
/* OK now, continue */
SetStatus(eEager);
self->iWarned = 0;
ContinueExecution(pExe);
return 1;
}
@ -444,6 +449,7 @@ static void ErrReport(pEVControl self)
returns
*/
self->eMode = EVMonitor;
self->iWarned = 0;
}
else
{
@ -467,6 +473,7 @@ static void ErrReport(pEVControl self)
/* interrupt */
SetInterrupt((int)ObVal(self->pParam,INTERRUPT));
self->iWarned = 0;
return 1;
}
/*---------------------------------------------------------------------------*/
@ -482,6 +489,7 @@ static void ErrReport(pEVControl self)
ErrWrite("Running to safe value");
self->pDriv->SetValue(self->pDriv, ObVal(self->pParam,SAFEVALUE));
self->eMode = EVIdle;
self->iWarned = 0;
return 1;
}
/*---------------------------------------------------------------------------*/
@ -1088,10 +1096,6 @@ static void ErrReport(pEVControl self)
}
iRet = VarlogWrapper(self->pLog,pCon,
argv[2],argv[3],argv[0]);
if(iRet)
{
SCSendOK(pCon);
}
return iRet;
}
else if( argc < 3) /* either parameter or drive */