diff --git a/motorApp/NewportSrc/XPSController.h b/motorApp/NewportSrc/XPSController.h index 8166f0a7..6d3fb1c8 100644 --- a/motorApp/NewportSrc/XPSController.h +++ b/motorApp/NewportSrc/XPSController.h @@ -10,6 +10,8 @@ USAGE... Newport XPS EPICS asyn motor device driver #include "asynMotorAxis.h" #include "XPSAxis.h" +#define XPS_MAX_AXES 8 + // drvInfo strings for extra parameters that the XPS controller supports #define XPSMinJerkString "XPS_MIN_JERK" #define XPSMaxJerkString "XPS_MAX_JERK" @@ -27,6 +29,11 @@ public: XPSAxis* getAxis(asynUser *pasynUser); XPSAxis* getAxis(int axisNo); + /* These are the functions for profile moves */ + asynStatus buildProfile(); + asynStatus executeProfile(); + asynStatus readbackProfile(); + /* These are the methods that are new to this class */ /* Deferred moves functions.*/ asynStatus processDeferredMoves(); @@ -44,7 +51,11 @@ protected: private: char *IPAddress_; int IPPort_; + char *ftpUsername_; + char *ftpPassword_; + char *profileGroupName_; int pollSocket_; + int moveSocket_; char firmwareVersion_[100]; int movesDeferred_;