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

Removed one argument from XPSConfigAxis

Browse Source
This commit is contained in:
MarkRivers
2006-04-08 20:09:23 +00:00
parent 6b02892bbc
commit 8c9fdc5d0a
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/NewportRegister.cc
+6 -8
View File
@@ -2,9 +2,9 @@
FILENAME... NewportRegister.cc
USAGE... Register Newport motor device driver shell commands.
Version: $Revision: 1.9 $
Version: $Revision: 1.10 $
Modified By: $Author: rivers $
Last Modified: $Date: 2006-04-06 23:58:48 $
Last Modified: $Date: 2006-04-08 20:07:14 $
*/
/*****************************************************************
@@ -65,7 +65,6 @@ static const iocshArg XPSConfigArg5 = {"Idle poll rate", iocshArgInt};
static const iocshArg XPSConfigAxisArg0 = {"Card number", iocshArgInt};
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 NewportSetupArgs[2] = {&setupArg0,
&setupArg1};
@@ -98,10 +97,9 @@ static const iocshArg * const XPSConfigArgs[6] = {&XPSConfigArg0,
&XPSConfigArg2,
&XPSConfigArg4,
&XPSConfigArg5};
static const iocshArg * const XPSConfigAxisArgs[4] = {&XPSConfigAxisArg0,
static const iocshArg * const XPSConfigAxisArgs[3] = {&XPSConfigAxisArg0,
&XPSConfigAxisArg1,
&XPSConfigAxisArg2,
&XPSConfigAxisArg3};
&XPSConfigAxisArg2};
static const iocshFuncDef setupMM3000 = {"MM300Setup", 2, NewportSetupArgs};
static const iocshFuncDef setupMM4000 = {"MM4000Setup",2, NewportSetupArgs};
@@ -116,7 +114,7 @@ static const iocshFuncDef configPM500 = {"PM500Config", 3, NewportConfigArgs};
static const iocshFuncDef configESP300 = {"ESP300Config", 3, NewportConfigArgs};
static const iocshFuncDef configXPSC8 = {"XPSC8Config", 4, NewportXPSC8ConfigArgs};
static const iocshFuncDef configXPS = {"XPSConfig", 6, XPSConfigArgs};
static const iocshFuncDef configXPSAxis= {"XPSConfigAxis",4, XPSConfigAxisArgs};
static const iocshFuncDef configXPSAxis= {"XPSConfigAxis",3, XPSConfigAxisArgs};
static const iocshFuncDef nameXPSC8 = {"XPSC8NameConfig",7, NewportXPSC8NameArgs};
static const iocshFuncDef XPSC8GatheringTest = {"xpsgathering",1, XPSArgs};
@@ -186,7 +184,7 @@ static void configXPSCallFunc(const iocshArgBuf *args)
static void configXPSAxisCallFunc(const iocshArgBuf *args)
{
XPSConfigAxis(args[0].ival, args[1].ival, args[2].sval, args[3].ival);
XPSConfigAxis(args[0].ival, args[1].ival, args[2].sval);
}
static void nameXPSC8CallFunc(const iocshArgBuf *args)
motorApp/NewportSrc/drvXPSAsyn.h
+3 -4
View File
@@ -14,10 +14,9 @@ int XPSConfig(int card, /* Controller number */
int movingPollRate, /* Rate to poll (Hz) when an axis is in motion */
int idlePollRate); /* Rate to poll (Hz) when an axis is idle */
int XPSConfigAxis(int card, /* specify which controller 0-up*/
int axis, /* axis number 0-7 */
const char *positionerName, /* groupName.positionerName e.g. Diffractometer.Phi */
int stepsPerUnit); /* steps per user unit */
int XPSConfigAxis(int card, /* specify which controller 0-up*/
int axis, /* axis number 0-7 */
const char *positionerName); /* groupName.positionerName e.g. Diffractometer.Phi */
#ifdef __cplusplus
}