- Added triple axis scan command.
- Introduced simulation mode to simdriv and simcter, i.e they never fail and finish at once. - Started defining MAD compatibility commands in Tcl - Fixed a bug in FOCUS_src which caused it to leak sockets. - Introduced setsockopt SO_REUSEADDR to all new sockets in sinqhm in order to loose the next sinqhm error.
This commit is contained in:
16
tasdrive.c
16
tasdrive.c
@ -21,9 +21,10 @@
|
||||
#include "sicsvar.h"
|
||||
#include "counter.h"
|
||||
#include "motor.h"
|
||||
#include "scan.h"
|
||||
#include "splitter.h"
|
||||
#include "tas.h"
|
||||
#include "tasu.h"
|
||||
#include "splitter.h"
|
||||
|
||||
|
||||
/* a token break function, implemented in stptok.c */
|
||||
@ -79,6 +80,13 @@ int TASDrive(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
self = (pTASdata)pData;
|
||||
assert(self);
|
||||
|
||||
/*
|
||||
check authorization
|
||||
*/
|
||||
if(!SCMatchRights(pCon,usUser))
|
||||
return 0;
|
||||
|
||||
|
||||
/* Initialize */
|
||||
Arg2Text(argc, argv,pLine,255);
|
||||
strtolower(pLine);
|
||||
@ -180,7 +188,7 @@ int TASDrive(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
{
|
||||
sprintf(pBueffel,"Driving %s to %f",
|
||||
tasMotorOrder[i],newPositions[i]);
|
||||
SCWrite(pCon,pBueffel,eValue);
|
||||
SCWrite(pCon,pBueffel,eWarning);
|
||||
status = StartMotor(pServ->pExecutor,pSics,pCon,
|
||||
tasMotorOrder[i],newPositions[i]);
|
||||
if(status == 0)
|
||||
@ -209,7 +217,7 @@ int TASDrive(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
{
|
||||
sprintf(pBueffel,"Driving %s to %f", tasVariableOrder[EI+i],
|
||||
self->tasPar[EI+i]->fVal);
|
||||
SCWrite(pCon,pBueffel,eValue);
|
||||
SCWrite(pCon,pBueffel,eWarning);
|
||||
}
|
||||
}
|
||||
/*
|
||||
@ -221,7 +229,7 @@ int TASDrive(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
{
|
||||
sprintf(pBueffel,"Driving %s to %f",tasMotorOrder[i],
|
||||
tasTargets[i]);
|
||||
SCWrite(pCon,pBueffel,eValue);
|
||||
SCWrite(pCon,pBueffel,eWarning);
|
||||
}
|
||||
}
|
||||
/*
|
||||
|
Reference in New Issue
Block a user