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

- Made the HRPT temperature log lmd200 work

Browse Source 
- Added a special el734hp which scales with 1000 for SANSLI
- Added another error to the magnet driver: magnet broken
This commit is contained in:
koennecke
2008-05-08 09:29:48 +00:00
parent 358c121b30
commit 5e96ae6939
7 changed files with 155 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
psi.c
View File

@ -174,6 +174,7 @@ static void RemovePsiCommands(SicsInterp *pSics){
MotorDriver *CreateEL734(SConnection *pCon, int argc, char *argv[]);
MotorDriver *CreateEL734DC(SConnection *pCon, int argc, char *argv[]);
MotorDriver *CreateEL734HP(SConnection *pCon, int argc, char *argv[]);
MotorDriver *CreateEL734HPT(SConnection *pCon, int argc, char *argv[]);
MotorDriver *MakePiPiezo(Tcl_Interp *pTcl,char *pArray);
/*-------------------------------------------------------------------*/
static pMotor CreatePsiMotor(SConnection *pCon, int argc, char *argv[]){
@ -220,6 +221,18 @@ static pMotor CreatePsiMotor(SConnection *pCon, int argc, char *argv[]){
SCWrite(pCon,pBueffel,eError);
return NULL;
}
} else if(strcmp(argv[1],"el734hpt") == 0){
pDriver = (MotorDriver *)CreateEL734HPT(pCon,argc-2,&argv[2]);
if(!pDriver){
return NULL;
}
/* create the motor */
pNew = MotorInit("EL734HPT",argv[0],pDriver);
if(!pNew){
sprintf(pBueffel,"Failure to create motor %s",argv[1]);
SCWrite(pCon,pBueffel,eError);
return NULL;
}
} else if(strcmp(argv[1],"el734dc") == 0){
pDriver = (MotorDriver *)CreateEL734DC(pCon,argc-2,&argv[2]);
if(!pDriver){
@ -417,7 +430,7 @@ static void ConfigureController(char *name, pEVControl pNew,
}
/*-------------------------------------------------------------------*/
extern pEVDriver CreateSLSDriv(int argc, char *argv[]);
extern pEVDriver CreateSLSVMEDriv(int argc, char *argv[]);
/*------------------------------------------------------------------*/
static pEVControl InstallPsiEnvironmentController(SicsInterp *pSics,
@ -506,6 +519,12 @@ static pEVControl InstallPsiEnvironmentController(SicsInterp *pSics,
if(pDriv != NULL){
pNew = CreateEVController(pDriv,argv[2],&status);
}
} else if(strcmp(argv[3],"vme-dsp") == 0) {
checkError = 1;
pDriv = CreateSLSVMEDriv(argc-4,&argv[4]);
if(pDriv != NULL){
pNew = CreateEVController(pDriv,argv[2],&status);
}
} else if(strcmp(argv[3],"el755") == 0){
checkError = 1;
pDriv = CreateEL755Driv(argc-4,&argv[4]);