lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

motor: added back in the model 2 XPS driver, and compiled it into a seperate library called NewportModel2. I also seperated out the XPS model 3 driver into a library called NewportModel3. For the model 3 driver there is now a seperate dbd file.

Browse Source
This commit is contained in:
mp49
2011-07-22 12:58:28 +00:00
parent a0951feaea
commit fbfb02499c
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/Makefile
+6 -5
View File
@@ -10,8 +10,9 @@ include $(TOP)/configure/CONFIG
INC += XPS_C8_drivers.h
DBD += devNewport.dbd
DBD += devNewportModel3.dbd
LIBRARY_IOC = Newport
LIBRARY_IOC = Newport NewportModel2 NewportModel3
Newport_SRCS += NewportRegister.cc
@@ -37,12 +38,12 @@ Newport_SRCS += XPS_C8_drivers.cpp
Newport_SRCS += drvXPSAsynAux.c
Newport_SRCS += xps_ftp.c
# This is the model 2 asyn driver
#Newport_SRCS += drvXPSAsyn.c XPSAsynInterpose.c
NewportModel2_SRCS += drvXPSAsyn.c XPSAsynInterpose.c
# This is the model 3 asyn driver
Newport_SRCS += XPSController.cpp
Newport_SRCS += XPSAxis.cpp
NewportModel3_SRCS += XPSController.cpp
NewportModel3_SRCS += XPSAxis.cpp
ifdef SNCSEQ
Newport_SRCS += XPS_trajectoryScan.st
NewportModel2_SRCS += XPS_trajectoryScan.st
endif
# strtok_r needed on WIN32
motorApp/NewportSrc/devNewport.dbd
+4 -4
View File
@@ -7,13 +7,13 @@ driver(drvMM3000)
driver(drvMM4000)
driver(drvPM500)
driver(drvESP300)
#driver(motorXPS)
driver(motorXPS)
driver(motorMM4000)
registrar(NewportRegister)
registrar(XPSGatheringRegister)
#registrar(XPSRegister)
registrar(XPSRegister3)
#registrar(XPSInterposeRegister)
registrar(XPSRegister)
#registrar(XPSRegister3)
registrar(XPSInterposeRegister)
registrar(drvXPSAsynAuxRegister)
registrar(MM4005_trajectoryScanRegistrar)
registrar(XPS_trajectoryScanRegistrar)
motorApp/NewportSrc/devNewportModel3.dbd
+26
View File
@@ -0,0 +1,26 @@
# Newport MM3000, MM4000/5, PM500 and ESP300 Device Driver support.
device(motor,VME_IO,devMM3000,"MM3000")
device(motor,VME_IO,devMM4000,"MM4000")
device(motor,VME_IO,devPM500, "PM500")
device(motor,VME_IO,devESP300,"ESP300")
driver(drvMM3000)
driver(drvMM4000)
driver(drvPM500)
driver(drvESP300)
#driver(motorXPS)
driver(motorMM4000)
registrar(NewportRegister)
registrar(XPSGatheringRegister)
#registrar(XPSRegister)
registrar(XPSRegister3)
#registrar(XPSInterposeRegister)
registrar(drvXPSAsynAuxRegister)
registrar(MM4005_trajectoryScanRegistrar)
registrar(XPS_trajectoryScanRegistrar)
#variable(devXPSC8Debug)
#variable(drvXPSC8Debug)
#variable(drvESP300debug)
#variable(drvMM3000debug)
#variable(drvMM4000debug)
#variable(drvPM500debug)