- Added Sycamore protocol and command context to SICS

- Added sinfo to SICS
- Added driver for TCP/IP Astrium velocity selector
- Added driver for TCP/IP Astrium chopper controller


SKIPPED:
	psi/amor2t.c
	psi/amorstat.c
	psi/dornier2.c
	psi/ecb.c
	psi/el734hp.c
	psi/fowrite.c
	psi/libpsi.a
	psi/make_gen
	psi/nextrics.c
	psi/pardef.c
	psi/pimotor.c
	psi/pipiezo.c
	psi/polterwrite.c
	psi/psi.c
	psi/scontroller.c
	psi/serial.c
	psi/tasinit.c
	psi/tasscan.c
	psi/tcpdocho.c
	psi/tcpdornier.c
	psi/tricssupport.c
	psi/velodornier.c
This commit is contained in:
koennecke
2005-12-22 22:16:10 +00:00
parent 603a4fc14b
commit b3138f1197
67 changed files with 4650 additions and 682 deletions

View File

@@ -374,12 +374,13 @@
}
}
/*--------------------------------------------------------------------*/
static int VarInterestCallback(int iEvent, void *pEvent, void *pUser)
static int VarInterestCallback(int iEvent, void *pEvent, void *pUser,
commandContext cc)
{
SConnection *pCon;
char pBueffel[512];
pSicsVariable pVar = NULL;
int iVal;
int iVal, status;
float fVal;
char *pText;
@@ -388,18 +389,21 @@
pVar = (pSicsVariable)pEvent;
pCon = (SConnection *)pUser;
SCPushContext2(pCon,cc);
switch(pVar->eType)
{
case veInt:
VarGetInt(pVar,&iVal);
sprintf(pBueffel,"%s = %d",pVar->name,iVal);
SCWrite(pCon,pBueffel,eValue);
return 1;
status = 1;
break;
case veFloat:
VarGetFloat(pVar,&fVal);
sprintf(pBueffel,"%s = %f",pVar->name,fVal);
SCWrite(pCon,pBueffel,eValue);
return 1;
status = 1;
break;
case veText:
VarGetText(pVar,&pText);
sprintf(pBueffel,"%s = %s", pVar->name,pText);
@@ -408,9 +412,11 @@
{
free(pText);
}
return 1;
status = 1;
break;
}
return 1;
SCPopContext(pCon);
return status;
}
/*----------------------------------------------------------------------*/
static int VarSetFromText(pSicsVariable self, SConnection *pCon, char *text)
@@ -559,7 +565,8 @@ static int VarSetFromText(pSicsVariable self, SConnection *pCon, char *text)
}
else if(strcmp(pCurrent->text,"interest") == 0) /* interest */
{
lID = RegisterCallback(pVar->pCall, VALUECHANGE, VarInterestCallback,
lID = RegisterCallback(pVar->pCall, SCGetContext(pCon),
VALUECHANGE, VarInterestCallback,
pCon, NULL);
SCRegister(pCon,pInterp, pVar->pCall,lID);
DeleteTokenList(pList);