From fc8798d0121076cea6b26e680c592b3a2c5896e4 Mon Sep 17 00:00:00 2001 From: Mark Koennecke Date: Wed, 26 Feb 2014 17:17:08 +0100 Subject: [PATCH] Reenabled EPICS motor support in order to make the attoCube controller work --- make_gen | 4 ++-- motor.c | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/make_gen b/make_gen index 8f0e4581..d8154fb1 100644 --- a/make_gen +++ b/make_gen @@ -5,8 +5,8 @@ # Markus Zolliker March 2003 #--------------------------------------------------------------------------- -#EPICSOBJ=epicsmotor.o -EPICSOBJ= +EPICSOBJ=epicsmotor.o +#EPICSOBJ= COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ) SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \ diff --git a/motor.c b/motor.c index a0be2715..c07cb051 100644 --- a/motor.c +++ b/motor.c @@ -1066,19 +1066,22 @@ int MotorCreate(SConnection * pCon, SicsInterp * pSics, void *pData, SCWrite(pCon, pBueffel, eLogError); return 0; } - /* } else if (strcmp(argv[2], "epics") == 0) { if(argc > 3){ pDriver = epicsMakeMotorDriver(argv[3]); if (!pDriver) { 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 { SCWrite(pCon,"ERROR: missing basename argument to create EPICS motor",eError); return 0; } - */ } else { site = getSite(); if (site != NULL) {