- Added SicsList

- Removed group and description attributes from ObjectDescriptor


SKIPPED:
	psi/dornier2.c
	psi/libpsi.a
	psi/make_gen
	psi/makefile_linux
	psi/pimotor.c
	psi/pipiezo.c
	psi/psi.c
	psi/serial.c
	psi/sinqhttp.c
	psi/sinqhttp.h
	psi/tcpdornier.c
	psi/velodornier.c
This commit is contained in:
koennecke
2006-01-16 08:32:07 +00:00
parent b3138f1197
commit 45fd50265f
20 changed files with 732 additions and 243 deletions

View File

@ -107,7 +107,7 @@ static int buildStandardCommandPart(TCLDriv *pDriv, char *command,
strncpy(pDriv->tclError,result,1023);
return HWFault;
}
sscanf(result,"%d%",&status);
sscanf(result,"%d",&status);
return status;
}
/*-------------------------------------------------------------------------*/
@ -182,12 +182,11 @@ static int evaluateInternalErrors(TCLDriv *pDriv, int *iCode,
assert(self);
pDriv = (TCLDriv *)self;
pDriv->errorCode = 0;
if(!buildStandardCommandPart(pDriv,"fixit",tclCommand,1023)){
pDriv->errorCode = FUNCNOTFOUND;
return HWFault;
}
snprintf(num,79,"%f",fNew);
snprintf(num,79,"%d %f",pDriv->errorCode, fNew);
strncat(tclCommand,num,1023-strlen(tclCommand));
status = Tcl_Eval(pServ->pSics->pTcl,tclCommand);
@ -201,7 +200,7 @@ static int evaluateInternalErrors(TCLDriv *pDriv, int *iCode,
strncpy(pDriv->tclError,result,1023);
return HWFault;
}
sscanf(result,"%d%",&status);
sscanf(result,"%d",&status);
return status;
}
/*--------------------------------------------------------------------------*/
@ -262,7 +261,7 @@ static int evaluateInternalErrors(TCLDriv *pDriv, int *iCode,
strncpy(pDriv->tclError,result,1023);
return HWFault;
}
sscanf(result,"%d%",&status);
sscanf(result,"%d",&status);
return status;
}
/*-----------------------------------------------------------------------*/