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

Reenabled EPICS motor support in order to make the attoCube controller work

Browse Source
This commit is contained in:
koennecke
2014-02-26 17:17:08 +01:00
parent f1c105085d
commit fc8798d012
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
make_gen
View File

@ -5,8 +5,8 @@
# Markus Zolliker March 2003 # Markus Zolliker March 2003
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
#EPICSOBJ=epicsmotor.o EPICSOBJ=epicsmotor.o
EPICSOBJ= #EPICSOBJ=
COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ) COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ)
SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \ SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \

9
motor.c
View File

@ -1066,19 +1066,22 @@ int MotorCreate(SConnection * pCon, SicsInterp * pSics, void *pData,
SCWrite(pCon, pBueffel, eLogError); SCWrite(pCon, pBueffel, eLogError);
return 0; return 0;
} }
/*
} else if (strcmp(argv[2], "epics") == 0) { } else if (strcmp(argv[2], "epics") == 0) {
if(argc > 3){ if(argc > 3){
pDriver = epicsMakeMotorDriver(argv[3]); pDriver = epicsMakeMotorDriver(argv[3]);
if (!pDriver) { if (!pDriver) {
return 0; return 0;
} }
pNew = MotorInit("epics", argv[1], pDriver);
if (!pNew) {
snprintf(pBueffel,sizeof(pBueffel)-1, "Failure to create motor %s", argv[1]);
SCWrite(pCon, pBueffel, eLogError);
return 0;
}
} else { } else {
SCWrite(pCon,"ERROR: missing basename argument to create EPICS motor",eError); SCWrite(pCon,"ERROR: missing basename argument to create EPICS motor",eError);
return 0; return 0;
} }
*/
} else { } else {
site = getSite(); site = getSite();
if (site != NULL) { if (site != NULL) {