diff --git a/motorApp/NewportSrc/Makefile b/motorApp/NewportSrc/Makefile index b14cb744..46a9daac 100644 --- a/motorApp/NewportSrc/Makefile +++ b/motorApp/NewportSrc/Makefile @@ -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 diff --git a/motorApp/NewportSrc/devNewport.dbd b/motorApp/NewportSrc/devNewport.dbd index aa8ee2ac..03b2f399 100644 --- a/motorApp/NewportSrc/devNewport.dbd +++ b/motorApp/NewportSrc/devNewport.dbd @@ -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) diff --git a/motorApp/NewportSrc/devNewportModel3.dbd b/motorApp/NewportSrc/devNewportModel3.dbd new file mode 100644 index 00000000..aa8ee2ac --- /dev/null +++ b/motorApp/NewportSrc/devNewportModel3.dbd @@ -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) +