- 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
This commit is contained in:
koennecke
2005-12-22 22:16:13 +00:00
parent 6b224a4520
commit a5f315b56a
22 changed files with 2225 additions and 90 deletions

View File

@@ -1339,7 +1339,7 @@ name of hkl object holding crystallographic information
return iRet;
}
/*-------------------------------------------------------------------------*/
static int FrameInterest(int iEvent, void *pEvent, void *pUser)
static int FrameInterest(int iEvent, void *pEvent, void *pUser, commandContext cc)
{
SConnection *pCon = NULL;
int *iFrame;
@@ -1354,7 +1354,9 @@ name of hkl object holding crystallographic information
iFrame = (int *)pEvent;
assert(pCon);
sprintf(pBueffel,"framenumber = %d",*iFrame);
SCPushContext2(pCon,cc);
SCWrite(pCon,pBueffel,eWarning);
SCPopContext(pCon);
return 1;
}
/*-------------------------------------------------------------------------
@@ -1454,6 +1456,7 @@ name of hkl object holding crystallographic information
char pBueffel[1024];
int iRet, iDet, iFrame;
long lID;
commandContext comCon;
self = (pNexTrics)pData;
assert(self);
@@ -1470,6 +1473,7 @@ name of hkl object holding crystallographic information
/* install an error handler */
NXMSetError((void *)pCon,SNError);
comCon = SCGetContext(pCon);
strtolower(argv[1]);
if(strcmp(argv[1],"start") == 0)
{
@@ -1505,7 +1509,7 @@ name of hkl object holding crystallographic information
}
else if(strcmp(argv[1],"interest") == 0)
{
lID = RegisterCallback(self->pCall, NEWFRAME, FrameInterest,
lID = RegisterCallback(self->pCall, comCon, NEWFRAME, FrameInterest,
pCon, NULL);
SCRegister(pCon,pSics, self->pCall,lID);
SCSendOK(pCon);