- Added a AsconReadDoneReconnect to ascon. This handles the case better when
a server hangs up diretcly after a message. - Some output was suppressed while tracing, fixed - Make ready to compile both with Ubuntu 32 and 64 or /usr/local based ON in general. Just in psi/makefile_linux the top include has to be adapted - Removed epics drivers from SICS. Still in source to be reenabled when needed - Added FindMotor - Added sput, sappend and slab to nxscript using the new sicsget module - Fix to sget to fix the "mot softzero" problem SKIPPED: psi/make_gen psi/psi.c psi/sinqhttpopt.c psi/spss7.c
This commit is contained in:
22
mumoconf.c
22
mumoconf.c
@ -158,28 +158,6 @@ static int GetNextToken(psParser self)
|
||||
return UNKNOWN;
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
in this code we need to find a motor for a name quite frequently.......
|
||||
*/
|
||||
pMotor FindMotor(SicsInterp * pSics, char *name)
|
||||
{
|
||||
CommandList *pC;
|
||||
pMotor pMot;
|
||||
|
||||
pC = FindCommand(pSics, name);
|
||||
if (!pC) {
|
||||
return NULL;
|
||||
}
|
||||
pMot = (pMotor) pC->pData;
|
||||
if (!pMot) {
|
||||
return NULL;
|
||||
}
|
||||
if (strcmp(pMot->pDescriptor->name, "Motor") != 0) {
|
||||
return NULL;
|
||||
}
|
||||
return pMot;
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
int MakeMulti(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
|
Reference in New Issue
Block a user