From 09be1211afdc05f9e7d42a775a09ac8c2797c80f Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Wed, 19 Apr 2006 22:00:39 +0000 Subject: [PATCH] Added stepsPerUnit back into XPSConfigAxis --- motorApp/NewportSrc/drvXPSAsyn.c | 4 +++- motorApp/NewportSrc/drvXPSAsyn.h | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/motorApp/NewportSrc/drvXPSAsyn.c b/motorApp/NewportSrc/drvXPSAsyn.c index 9eafedc5..43e0a5f2 100644 --- a/motorApp/NewportSrc/drvXPSAsyn.c +++ b/motorApp/NewportSrc/drvXPSAsyn.c @@ -782,7 +782,8 @@ int XPSConfig(int card, /* Controller number */ int XPSConfigAxis(int card, /* specify which controller 0-up*/ int axis, /* axis number 0-7 */ - const char *positionerName) /* groupName.positionerName e.g. Diffractometer.Phi */ + const char *positionerName, /* groupName.positionerName e.g. Diffractometer.Phi */ + int stepsPerUnit) /* steps per user unit */ { XPSController *pController; AXIS_HDL pAxis; @@ -813,6 +814,7 @@ int XPSConfigAxis(int card, /* specify which controller 0-up*/ index = strchr(pAxis->groupName, '.'); if (index != NULL) *index = '\0'; /* Terminate group name at place of '.' */ + pAxis->stepSize = 1./stepsPerUnit; /* Read some information from the controller for this axis */ status = PositionerSGammaParametersGet(pAxis->pollSocket, pAxis->positionerName, diff --git a/motorApp/NewportSrc/drvXPSAsyn.h b/motorApp/NewportSrc/drvXPSAsyn.h index 14576198..e78de995 100644 --- a/motorApp/NewportSrc/drvXPSAsyn.h +++ b/motorApp/NewportSrc/drvXPSAsyn.h @@ -14,9 +14,10 @@ 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 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 */ #ifdef __cplusplus }