- Added separate drivable motors for four circle H, K, L
- Added a listen mode to commandlog in order to support the batchEditor - Some small fixes to exe* for BatchEditor
This commit is contained in:
18
macro.c
18
macro.c
@@ -129,7 +129,7 @@
|
||||
SConnection *pCon = NULL;
|
||||
CommandList *pCommand = NULL;
|
||||
char *lastCommand = NULL, comBuffer[132];
|
||||
int iRet,i;
|
||||
int iRet = 0,i;
|
||||
int iMacro;
|
||||
|
||||
/* get the datastructures */
|
||||
@@ -194,7 +194,7 @@
|
||||
}
|
||||
|
||||
/* finish */
|
||||
if(iRet)
|
||||
if(iRet == 1)
|
||||
{
|
||||
return TCL_OK;
|
||||
}
|
||||
@@ -322,12 +322,16 @@ static int ProtectedExec(ClientData clientData, Tcl_Interp *interp,
|
||||
pUnbekannt = pUnknown;
|
||||
Tcl_CreateCommand(pInter,"unknown",SicsUnknownProc,
|
||||
pUnknown, UnknownKill);
|
||||
|
||||
|
||||
/* delete dangers */
|
||||
Tcl_DeleteCommand(pInter,"exit");
|
||||
Tcl_DeleteCommand(pInter,"socket");
|
||||
Tcl_DeleteCommand(pInter,"vwait");
|
||||
Tcl_DeleteCommand(pInter,"exec");
|
||||
|
||||
/*
|
||||
install protected exec command
|
||||
*/
|
||||
Tcl_CreateObjCommand(pInter,"exec",ProtectedExec,NULL,KillExec);
|
||||
|
||||
return pInter;
|
||||
@@ -847,8 +851,9 @@ static int ProtectedExec(ClientData clientData, Tcl_Interp *interp,
|
||||
|
||||
iRet = Tcl_Eval(pTcl,pBueffel);
|
||||
if(iRet == TCL_OK)
|
||||
{ /* possibly a bug here */
|
||||
SCWrite(pCon,pTcl->result,eStatus);
|
||||
{
|
||||
strncpy(pBueffel,pTcl->result,1023);
|
||||
SCWrite(pCon,pBueffel,eStatus);
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
@@ -862,7 +867,8 @@ static int ProtectedExec(ClientData clientData, Tcl_Interp *interp,
|
||||
else
|
||||
{
|
||||
Tcl_UnsetVar(pTcl,SICSERROR,TCL_GLOBAL_ONLY);
|
||||
SCWrite(pCon,pTcl->result,eError);
|
||||
strncpy(pBueffel,pTcl->result,1023);
|
||||
SCWrite(pCon,pBueffel,eError);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user