- New batch file management module
- New oscillator module - Bug fixes SKIPPED: psi/buffer.c psi/el734hp.c psi/el737hpdriv.c psi/make_gen psi/nextrics.c psi/nxamor.c psi/pimotor.c psi/polterwrite.c psi/psi.c psi/swmotor2.c psi/tasscan.c psi/tricssupport.c psi/tricssupport.h psi/tecs/make_gen psi/utils/ecb_load_new/ecb_load.c psi/utils/ecb_load_new/ecb_load.h psi/utils/ecb_load_new/ecbdriv_els.c psi/utils/ecb_load_new/gpib_els.c psi/utils/ecb_load_new/makefile psi/utils/ecb_load_new/makefile_EGPIB psi/utils/ecb_load_new/makefile_GPIB
This commit is contained in:
5
macro.c
5
macro.c
@@ -1,6 +1,6 @@
|
||||
/*--------------------------------------------------------------------------
|
||||
|
||||
All you need to evaluate macros with SICS.
|
||||
All you need to evaluate macros with SICS
|
||||
|
||||
The implmentation for the macro stuff is complex and non intuitive.
|
||||
This is the price to pay for adding the extremly powerful and
|
||||
@@ -138,6 +138,7 @@
|
||||
pSinter = pSics->pInter;
|
||||
pCon = pSics->pCon[pSics->iStack];
|
||||
lastCommand = pSics->lastUnknown[pSics->iStack];
|
||||
pCon->sicsError = 0;
|
||||
|
||||
assert(pSinter);
|
||||
assert(pCon);
|
||||
@@ -200,6 +201,7 @@
|
||||
else
|
||||
{
|
||||
Tcl_SetVar(pInter,SICSERROR,"yes",TCL_GLOBAL_ONLY);
|
||||
pCon->sicsError = 1;
|
||||
return TCL_ERROR;
|
||||
}
|
||||
}
|
||||
@@ -948,7 +950,6 @@ static int ProtectedExec(ClientData clientData, Tcl_Interp *interp,
|
||||
SCWrite(pCon,pStart,eError);
|
||||
}
|
||||
iRet = InterpExecute(pSics,pCon,pCommand);
|
||||
SicsWait(1);
|
||||
SCWrite(pCon,"TRANSACTIONFINISHED",eError);
|
||||
return iRet;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user