From 1e7800f43f433b166b840679c47fb3b1815b4a74 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Tue, 30 Aug 2011 19:00:18 +0000 Subject: [PATCH] Enabled XPSRegister3, since it no longer conflicts with XPSRegister --- motorApp/NewportSrc/Makefile | 11 ++- motorApp/NewportSrc/XPSController.cpp | 102 +++++++++++++------------- motorApp/NewportSrc/devNewport.dbd | 2 +- 3 files changed, 57 insertions(+), 58 deletions(-) diff --git a/motorApp/NewportSrc/Makefile b/motorApp/NewportSrc/Makefile index 46a9daac..40e001b6 100644 --- a/motorApp/NewportSrc/Makefile +++ b/motorApp/NewportSrc/Makefile @@ -10,9 +10,8 @@ include $(TOP)/configure/CONFIG INC += XPS_C8_drivers.h DBD += devNewport.dbd -DBD += devNewportModel3.dbd -LIBRARY_IOC = Newport NewportModel2 NewportModel3 +LIBRARY_IOC = Newport Newport_SRCS += NewportRegister.cc @@ -38,12 +37,12 @@ Newport_SRCS += XPS_C8_drivers.cpp Newport_SRCS += drvXPSAsynAux.c Newport_SRCS += xps_ftp.c # This is the model 2 asyn driver -NewportModel2_SRCS += drvXPSAsyn.c XPSAsynInterpose.c +Newport_SRCS += drvXPSAsyn.c XPSAsynInterpose.c # This is the model 3 asyn driver -NewportModel3_SRCS += XPSController.cpp -NewportModel3_SRCS += XPSAxis.cpp +Newport_SRCS += XPSController.cpp +Newport_SRCS += XPSAxis.cpp ifdef SNCSEQ -NewportModel2_SRCS += XPS_trajectoryScan.st +Newport_SRCS += XPS_trajectoryScan.st endif # strtok_r needed on WIN32 diff --git a/motorApp/NewportSrc/XPSController.cpp b/motorApp/NewportSrc/XPSController.cpp index b6772b52..60f58c7e 100644 --- a/motorApp/NewportSrc/XPSController.cpp +++ b/motorApp/NewportSrc/XPSController.cpp @@ -1302,9 +1302,9 @@ asynStatus XPSController::noDisableError() extern "C" { -asynStatus XPSConfig(const char *portName, const char *IPAddress, int IPPort, - int numAxes, int movingPollPeriod, int idlePollPeriod, - int enableSetPosition, int setPositionSettlingTime) +asynStatus XPSCreateController(const char *portName, const char *IPAddress, int IPPort, + int numAxes, int movingPollPeriod, int idlePollPeriod, + int enableSetPosition, int setPositionSettlingTime) { XPSController *pXPSController = new XPSController(portName, IPAddress, IPPort, numAxes, @@ -1316,14 +1316,14 @@ asynStatus XPSConfig(const char *portName, const char *IPAddress, int IPPort, -asynStatus XPSConfigAxis(const char *XPSName, /* specify which controller by port name */ +asynStatus XPSCreateAxis(const char *XPSName, /* specify which controller by port name */ int axis, /* axis number 0-7 */ const char *positionerName, /* groupName.positionerName e.g. Diffractometer.Phi */ - int stepsPerUnit) /* steps per user unit */ + double stepsPerUnit) /* steps per user unit */ { XPSController *pC; XPSAxis *pAxis; - static const char *functionName = "XPSConfigAxis"; + static const char *functionName = "XPSCreateAxis"; pC = (XPSController*) findAsynPortDriver(XPSName); if (!pC) { @@ -1339,13 +1339,13 @@ asynStatus XPSConfigAxis(const char *XPSName, /* specify which controlle } -asynStatus XPSConfigProfile(const char *XPSName, /* specify which controller by port name */ +asynStatus XPSCreateProfile(const char *XPSName, /* specify which controller by port name */ int maxPoints, /* maximum number of profile points */ const char *ftpUsername, /* FTP account name */ const char *ftpPassword) /* FTP password */ { XPSController *pC; - static const char *functionName = "XPSConfigProfile"; + static const char *functionName = "XPSCreateProfile"; pC = (XPSController*) findAsynPortDriver(XPSName); if (!pC) { @@ -1392,65 +1392,65 @@ asynStatus XPSNoDisableError(const char *XPSName) /* Code for iocsh registration */ -/* XPSConfig */ -static const iocshArg XPSConfigArg0 = {"Controller port name", iocshArgString}; -static const iocshArg XPSConfigArg1 = {"IP address", iocshArgString}; -static const iocshArg XPSConfigArg2 = {"IP port", iocshArgInt}; -static const iocshArg XPSConfigArg3 = {"Number of axes", iocshArgInt}; -static const iocshArg XPSConfigArg4 = {"Moving poll rate (ms)", iocshArgInt}; -static const iocshArg XPSConfigArg5 = {"Idle poll rate (ms)", iocshArgInt}; -static const iocshArg XPSConfigArg6 = {"Enable set position", iocshArgInt}; -static const iocshArg XPSConfigArg7 = {"Set position settling time (ms)", iocshArgInt}; -static const iocshArg * const XPSConfigArgs[] = {&XPSConfigArg0, - &XPSConfigArg1, - &XPSConfigArg2, - &XPSConfigArg2, - &XPSConfigArg4, - &XPSConfigArg5, - &XPSConfigArg6, - &XPSConfigArg7}; -static const iocshFuncDef configXPS = {"XPSConfig", 8, XPSConfigArgs}; +/* XPSCreateController */ +static const iocshArg XPSCreateControllerArg0 = {"Controller port name", iocshArgString}; +static const iocshArg XPSCreateControllerArg1 = {"IP address", iocshArgString}; +static const iocshArg XPSCreateControllerArg2 = {"IP port", iocshArgInt}; +static const iocshArg XPSCreateControllerArg3 = {"Number of axes", iocshArgInt}; +static const iocshArg XPSCreateControllerArg4 = {"Moving poll rate (ms)", iocshArgInt}; +static const iocshArg XPSCreateControllerArg5 = {"Idle poll rate (ms)", iocshArgInt}; +static const iocshArg XPSCreateControllerArg6 = {"Enable set position", iocshArgInt}; +static const iocshArg XPSCreateControllerArg7 = {"Set position settling time (ms)", iocshArgInt}; +static const iocshArg * const XPSCreateControllerArgs[] = {&XPSCreateControllerArg0, + &XPSCreateControllerArg1, + &XPSCreateControllerArg2, + &XPSCreateControllerArg2, + &XPSCreateControllerArg4, + &XPSCreateControllerArg5, + &XPSCreateControllerArg6, + &XPSCreateControllerArg7}; +static const iocshFuncDef configXPS = {"XPSCreateController", 8, XPSCreateControllerArgs}; static void configXPSCallFunc(const iocshArgBuf *args) { - XPSConfig(args[0].sval, args[1].sval, args[2].ival, - args[3].ival, args[4].ival, args[5].ival, - args[6].ival, args[7].ival); + XPSCreateController(args[0].sval, args[1].sval, args[2].ival, + args[3].ival, args[4].ival, args[5].ival, + args[6].ival, args[7].ival); } -/* XPSConfigAxis */ -static const iocshArg XPSConfigAxisArg0 = {"Controller port name", iocshArgString}; -static const iocshArg XPSConfigAxisArg1 = {"Axis number", iocshArgInt}; -static const iocshArg XPSConfigAxisArg2 = {"Axis name", iocshArgString}; -static const iocshArg XPSConfigAxisArg3 = {"Steps per unit", iocshArgInt}; -static const iocshArg * const XPSConfigAxisArgs[] = {&XPSConfigAxisArg0, - &XPSConfigAxisArg1, - &XPSConfigAxisArg2, - &XPSConfigAxisArg3}; -static const iocshFuncDef configXPSAxis = {"XPSConfigAxis", 4, XPSConfigAxisArgs}; +/* XPSCreateAxis */ +static const iocshArg XPSCreateAxisArg0 = {"Controller port name", iocshArgString}; +static const iocshArg XPSCreateAxisArg1 = {"Axis number", iocshArgInt}; +static const iocshArg XPSCreateAxisArg2 = {"Axis name", iocshArgString}; +static const iocshArg XPSCreateAxisArg3 = {"Steps per unit", iocshArgString}; +static const iocshArg * const XPSCreateAxisArgs[] = {&XPSCreateAxisArg0, + &XPSCreateAxisArg1, + &XPSCreateAxisArg2, + &XPSCreateAxisArg3}; +static const iocshFuncDef configXPSAxis = {"XPSCreateAxis", 4, XPSCreateAxisArgs}; static void configXPSAxisCallFunc(const iocshArgBuf *args) { - XPSConfigAxis(args[0].sval, args[1].ival, args[2].sval, args[3].ival); + XPSCreateAxis(args[0].sval, args[1].ival, args[2].sval, atof(args[3].sval)); } -/* XPSConfigProfile */ -static const iocshArg XPSConfigProfileArg0 = {"Controller port name", iocshArgString}; -static const iocshArg XPSConfigProfileArg1 = {"Max points", iocshArgInt}; -static const iocshArg XPSConfigProfileArg2 = {"FTP username", iocshArgString}; -static const iocshArg XPSConfigProfileArg3 = {"FTP password", iocshArgString}; -static const iocshArg * const XPSConfigProfileArgs[] = {&XPSConfigProfileArg0, - &XPSConfigProfileArg1, - &XPSConfigProfileArg2, - &XPSConfigProfileArg3}; -static const iocshFuncDef configXPSProfile = {"XPSConfigProfile", 4, XPSConfigProfileArgs}; +/* XPSCreateProfile */ +static const iocshArg XPSCreateProfileArg0 = {"Controller port name", iocshArgString}; +static const iocshArg XPSCreateProfileArg1 = {"Max points", iocshArgInt}; +static const iocshArg XPSCreateProfileArg2 = {"FTP username", iocshArgString}; +static const iocshArg XPSCreateProfileArg3 = {"FTP password", iocshArgString}; +static const iocshArg * const XPSCreateProfileArgs[] = {&XPSCreateProfileArg0, + &XPSCreateProfileArg1, + &XPSCreateProfileArg2, + &XPSCreateProfileArg3}; +static const iocshFuncDef configXPSProfile = {"XPSCreateProfile", 4, XPSCreateProfileArgs}; static void configXPSProfileCallFunc(const iocshArgBuf *args) { - XPSConfigProfile(args[0].sval, args[1].ival, args[2].sval, args[3].sval); + XPSCreateProfile(args[0].sval, args[1].ival, args[2].sval, args[3].sval); } diff --git a/motorApp/NewportSrc/devNewport.dbd b/motorApp/NewportSrc/devNewport.dbd index 03b2f399..5fc91f45 100644 --- a/motorApp/NewportSrc/devNewport.dbd +++ b/motorApp/NewportSrc/devNewport.dbd @@ -12,7 +12,7 @@ driver(motorMM4000) registrar(NewportRegister) registrar(XPSGatheringRegister) registrar(XPSRegister) -#registrar(XPSRegister3) +registrar(XPSRegister3) registrar(XPSInterposeRegister) registrar(drvXPSAsynAuxRegister) registrar(MM4005_trajectoryScanRegistrar)