- Currently disabled attempts at logging commands
- Added a warning for excessive data rates on monitors - Added statistics to devser and thus to scriptcontext - Added byte concatenation to dynstring - Added aborting for reflection generation to fourmess.c - Added data checksum testing to hipadaba, use for update tests - Fixed interrupt discovery in network.c, caused invalid interrupt codes which in turn confused sicscron which had to be fixed too. - Renamed ubcalc into ubcalcint in order to reclaim the ubcalc for Jurg - Added an a3offset to tasub in order to fix what I perceive an IS problem - Added support for the newer version of the Siemens SPS, the S7 - Added a not yet fully working sinqhttpopt driver which talks to http HM without libghttp SKIPPED: psi/delcam.c psi/make_gen psi/psi.c psi/sinq.c psi/sinq.h psi/sinqhttpopt.c psi/slsvme.c psi/spss7.c
This commit is contained in:
44
macro.c
44
macro.c
@@ -118,33 +118,6 @@ int MacroPop(void)
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
/*---------------------------------------------------------------------------
|
||||
* This is to suppress certain stuff from the history log in order to stop it
|
||||
* from filling with garbage
|
||||
-----------------------------------------------------------------------------*/
|
||||
static int historyFilter(pDummy pDum, char *command, char *fullCommand)
|
||||
{
|
||||
static char *toRemove[] = {"sct", "hupdate",NULL};
|
||||
static char *typeRemove[] = {"ScriptContext",NULL};
|
||||
int i = 0;
|
||||
|
||||
while(toRemove[i] != NULL){
|
||||
if(strcmp(command,toRemove[i]) == 0){
|
||||
return 0;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
i = 0;
|
||||
while(typeRemove[i] != NULL){
|
||||
if(strcmp(pDum->pDescriptor->name, typeRemove[i]) == 0) {
|
||||
return 0;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static int SicsUnknownProc(ClientData pData, Tcl_Interp * pInter,
|
||||
int argc, char *argv[])
|
||||
@@ -155,7 +128,7 @@ static int SicsUnknownProc(ClientData pData, Tcl_Interp * pInter,
|
||||
SicsInterp *pSinter = NULL;
|
||||
SConnection *pCon = NULL;
|
||||
CommandList *pCommand = NULL;
|
||||
char *lastCommand = NULL, comBuffer[132], comHistory[256];
|
||||
char *lastCommand = NULL, comBuffer[132];
|
||||
int iRet = 0, i;
|
||||
int iMacro;
|
||||
Statistics *old;
|
||||
@@ -216,18 +189,6 @@ static int SicsUnknownProc(ClientData pData, Tcl_Interp * pInter,
|
||||
StatisticsEnd(old);
|
||||
SCsetMacro(pCon, iMacro);
|
||||
|
||||
if(iRet == 1){
|
||||
/*
|
||||
* this is OK because comBuffer is length restricted
|
||||
*/
|
||||
strcpy(comHistory,"SICSUNKNOWN: ");
|
||||
strcat(comHistory,comBuffer);
|
||||
/* This gives just to many unwanted entries.... TODO: Filter better
|
||||
if(historyFilter(pCommand->pData, myarg[0], comBuffer) == 1){
|
||||
WriteCommandHistory(comHistory);
|
||||
}
|
||||
*/
|
||||
}
|
||||
/*
|
||||
lastUnkown gets deeply stacked with each SICS command exec'd.
|
||||
This is not reflected in code. However, lastUnknown has already
|
||||
@@ -240,6 +201,7 @@ static int SicsUnknownProc(ClientData pData, Tcl_Interp * pInter,
|
||||
|
||||
/* finish */
|
||||
if (iRet == 1) {
|
||||
WriteCommandHistory(comBuffer);
|
||||
return TCL_OK;
|
||||
} else {
|
||||
Tcl_SetVar(pInter, SICSERROR, "yes", TCL_GLOBAL_ONLY);
|
||||
@@ -989,7 +951,9 @@ static int TclAction(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
return 0;
|
||||
}
|
||||
Tcl_ResetResult(pTcl);
|
||||
SetWriteHistory(0);
|
||||
iRet = Tcl_Eval(pTcl, pCommand);
|
||||
SetWriteHistory(1);
|
||||
if (iRet == TCL_OK) {
|
||||
if (strlen(pTcl->result) > 0) {
|
||||
SCPrintf(pCon, eValue, "%s", pTcl->result);
|
||||
|
||||
Reference in New Issue
Block a user