- fixed a bug in pause handling of environment controller.
- added code to triple axis MAD emulation layer
This commit is contained in:
24
tasscan.c
24
tasscan.c
@@ -587,9 +587,16 @@ static int TASScanDrive(pScanData self, int iPoint)
|
||||
|
||||
/*
|
||||
now wait for our motors to arrive, thereby ignoring any error
|
||||
returns.
|
||||
returns. DO NOT WAIT if fast scan!
|
||||
*/
|
||||
status = Wait4Success(GetExecutor());
|
||||
if(pTAS->iFast)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
status = Wait4Success(GetExecutor());
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
@@ -1231,6 +1238,19 @@ int TASScan(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
if(!SCMatchRights(pCon,usUser))
|
||||
return 0;
|
||||
|
||||
/*
|
||||
check if we are a fast scan or a normal scan
|
||||
*/
|
||||
strtolower(argv[0]);
|
||||
if(strcmp(argv[0],"sf") == 0)
|
||||
{
|
||||
pTAS->iFast = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
pTAS->iFast = 0;
|
||||
}
|
||||
|
||||
/* Initialize parsing*/
|
||||
Arg2Text(argc, argv,pLine,1023);
|
||||
strtolower(pLine);
|
||||
|
||||
Reference in New Issue
Block a user