From 04bd1abeca945a35c9ef80cfb6f63007e71aa483 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Thu, 7 Apr 2011 03:32:11 +0000 Subject: [PATCH] Added readbackProfile; changed poll to use bool --- motorApp/NewportSrc/XPSAxis.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/motorApp/NewportSrc/XPSAxis.h b/motorApp/NewportSrc/XPSAxis.h index b607d233..94fcbaad 100644 --- a/motorApp/NewportSrc/XPSAxis.h +++ b/motorApp/NewportSrc/XPSAxis.h @@ -38,10 +38,11 @@ class XPSAxis : public asynMotorAxis asynStatus moveVelocity(double min_velocity, double max_velocity, double acceleration); asynStatus home(double min_velocity, double max_velocity, double acceleration, int forwards); asynStatus stop(double acceleration); - asynStatus poll(int *moving); + asynStatus poll(bool *moving); asynStatus setPosition(double position); virtual asynStatus defineProfile(double *positions, size_t numPoints); + virtual asynStatus readbackProfile(); private: XPSController *pC_; @@ -75,6 +76,8 @@ class XPSAxis : public asynMotorAxis char *groupName_; int positionerError_; int axisStatus_; + double profilePreDistance_; + double profilePostDistance_; xpsCorrectorInfo_t xpsCorrectorInfo_; double deferredPosition_; int deferredMove_;