- Reworked the connection object and the IO system

- Reworked the support for TRICS
- Added a second generation motor
This commit is contained in:
koennecke
2009-02-03 08:05:39 +00:00
parent f6d595665e
commit 361ee9ebea
119 changed files with 16455 additions and 3674 deletions

26
ofac.c
View File

@ -85,7 +85,6 @@
#include "udpquieck.h"
#include "choco.h"
#include "chadapter.h"
#include "hklscan.h"
#include "xytable.h"
#include "maximize.h"
#include "difrac.h"
@ -129,6 +128,10 @@
#include "hdbqueue.h"
#include "genericcontroller.h"
#include "proxy.h"
#include "reflist.h"
#include "singlex.h"
#include "motorsec.h"
#include "background.h"
/*----------------------- Server options creation -------------------------*/
static int IFServerOption(SConnection *pCon, SicsInterp *pSics, void *pData,
int argc, char *argv[])
@ -257,7 +260,8 @@
AddCommand(pInter,"list",SicsList,NULL,NULL);
AddCommand(pInter,"InstallHdb",InstallSICSHipadaba,NULL,NULL);
MakeProtocol(pInter);
InstallBackground(pInter);
/* commands to do with the executor. Only StopExe carries the
DeleteFunction in order to avoid double deletion. All the
other commands operate on the same datastructure.
@ -269,7 +273,7 @@
AddCommand(pInter,"pause",PauseAction,NULL,pExe);
AddCommand(pInter,"continue",ContinueAction,NULL,pExe);
AddCommand(pInter,"devexec",DevexecAction,NULL,pExe);
/* add additional object creation commands here */
AddCommand(pInter,"TokenInit",TokenInit,NULL,NULL);
AddCommand(pInter,"ServerOption",IFServerOption,NULL,NULL);
@ -296,7 +300,6 @@
AddCommand(pInter,"kill_command",SICSKill,NULL,NULL);
AddCommand(pInter,"MakeChopper",ChocoFactory,NULL,NULL);
AddCommand(pInter,"ChopperAdapter",CHAdapterFactory,NULL,NULL);
AddCommand(pInter,"MakeHklscan",HklscanFactory,NULL,NULL);
AddCommand(pInter,"MakeXYTable",XYFactory,NULL,NULL);
AddCommand(pInter,"MakeMaximize",MaximizeFactory,NULL,NULL);
AddCommand(pInter,"MakeLin2Ang",MakeLin2Ang,NULL,NULL);
@ -350,6 +353,9 @@
AddCommand(pInter,"MakeGenController",GenControllerFactory,NULL,NULL);
AddCommand(pInter,"genconfigure",GenControllerConfigure,NULL,NULL);
AddCommand(pInter,"MakeProxy",ProxyFactory,NULL,NULL);
AddCommand(pInter,"MakeRefList",MakeReflectionList,NULL,NULL);
AddCommand(pInter,"MakeSingleX",MakeSingleX,NULL,NULL);
AddCommand(pInter,"MakeSecMotor",SecMotorFactory,NULL,NULL);
/*
install site specific commands
@ -425,6 +431,9 @@
RemoveCommand(pSics,"MakeGenController");
RemoveCommand(pSics,"genconfigure");
RemoveCommand(pSics,"MakeProxy");
RemoveCommand(pSics,"MakeRefList");
RemoveCommand(pSics,"MakeSingleX");
RemoveCommand(pSics,"MakeSecMotor");
/*
remove site specific installation commands
*/
@ -475,21 +484,12 @@
InitIniCommands(pSics,pServ->pTasker);
InstallBckRestore(pCon,pSics);
pCon->iFiles = 0;
/* evaluate the file */
sprintf(pBueffel,"fileeval %s",file);
iRet = InterpExecute(pSics,pCon,pBueffel);
if(!iRet)
{
KillIniCommands(pSics);
RemoveStartupCommands();
SCDeleteConnection(pCon);
return 0;
}
/* done */
pCon->iFiles = 0;
SCDeleteConnection(pCon);
KillIniCommands(pSics);
RemoveStartupCommands();