linse/sicspsi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- extended evcontroller

Browse Source 
- remote objects
- new ev drivers for oxford IPS,ITC,ILM and LC
M.Z.
This commit is contained in:
cvs
2004-11-17 11:32:05 +00:00
parent 2a93216346
commit aa9ab52528
26 changed files with 3772 additions and 879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
psi.c
View File

@ -39,7 +39,6 @@
#include "tdchm.h"
#include "tecsdriv.h"
#include "itc4.h"
#include "ipsdriv.h"
#include "bruker.h"
#include "ltc11.h"
#include "A1931.h"
@ -50,10 +49,13 @@
#include "amorscan.h"
#include "serial.h"
#include "fomerge.h"
#include "remob.h"
#include "tricssupport.h"
static pSite sitePSI = NULL;
int LoggerGraph(SConnection *pCon, SicsInterp *pSics, void *pData, int argc, char *argv[]);
/*----------------------------------------------------------------------*/
static void AddPsiCommands(SicsInterp *pInter){
AddCommand(pInter,"MakeRuenBuffer",InitBufferSys,NULL,NULL);
@ -77,6 +79,8 @@ static void AddPsiCommands(SicsInterp *pInter){
AddCommand(pInter,"MakePSDFrame",MakeFrameFunc,NULL,NULL);
AddCommand(pInter,"SerialInit",SerialInit,NULL,NULL);
AddCommand(pInter,"InstallFocusMerge",InstallFocusMerge,NULL,NULL);
AddCommand(pInter,"Remob",RemobCreate,NULL,NULL);
AddCommand(pInter,"Graph",LoggerGraph,NULL,NULL);
/*
AddCommand(pInter,"MakeDifrac",MakeDifrac,NULL,NULL);
*/
@ -317,8 +321,6 @@ static void ConfigureController(char *name, pEVControl pNew,
EVCSetPar(pNew,"lowerlimit",1.0,pCon);
if(strcmp(name,"tecs") == 0){
TecsCustomize(pCon, pNew);
} else if(strcmp(name,"ips") == 0){
IpsCustomize(pCon, pNew);
} else if(strcmp(name,"euro") == 0){
EVCSetPar(pNew,"upperlimit",750.0,pCon);
EVCSetPar(pNew,"lowerlimit",15.0,pCon);
@ -335,7 +337,13 @@ static void ConfigureController(char *name, pEVControl pNew,
}
/*-------------------------------------------------------------------*/
extern pEVDriver CreateSLSDriv(int argc, char *argv[]);
pEVControl IpsMakeEVC(SConnection *pCon, int argc, char *argv[]);
pEVControl ItcMakeEVC(SConnection *pCon, int argc, char *argv[]);
pEVControl IlmMakeEVC(SConnection *pCon, int argc, char *argv[]);
pEVControl LcMakeEVC(SConnection *pCon, int argc, char *argv[]);
/*------------------------------------------------------------------*/
static pEVControl InstallPsiEnvironmentController(SicsInterp *pSics,
SConnection *pCon,
int argc, char *argv[]){
@ -374,16 +382,13 @@ static pEVControl InstallPsiEnvironmentController(SicsInterp *pSics,
}
}
} else if(strcmp(argv[3],"ips") == 0) {
checkError = 1;
pDriv = CreateIpsDriver(argc-4,&argv[4]);
if(pDriv){
pNew = CreateEVController(pDriv,argv[2],&status);
if(pNew != NULL){
AddCommand(pSics,argv[2],IpsWrapper,DeleteEVController,
pNew);
commandInstalled = 1;
}
}
return IpsMakeEVC(pCon, argc-2, argv+2); /* we should organize all devices like this M.Z. */
} else if(strcmp(argv[3],"itc") == 0) {
return ItcMakeEVC(pCon, argc-2, argv+2);
} else if(strcmp(argv[3],"ilm") == 0) {
return IlmMakeEVC(pCon, argc-2, argv+2);
} else if(strcmp(argv[3],"lc") == 0) {
return LcMakeEVC(pCon, argc-2, argv+2);
} else if(strcmp(argv[3],"bruker") == 0){
checkError = 1;
pDriv = CreateBrukerDriver(argc-4,&argv[4]);
@ -439,6 +444,10 @@ static pEVControl InstallPsiEnvironmentController(SicsInterp *pSics,
if(pDriv != NULL){
pNew = CreateEVController(pDriv,argv[2],&status);
}
} else {
sprintf(pBueffel,"ERROR: %s not recognized as a valid driver type", argv[3]);
SCWrite(pCon,pBueffel,eError);
return NULL;
}
/* if we recognized the driver, check for installation errors */