From 006488b7263a64f664d3bf8f3d5b8bbf7e67d94c Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Thu, 31 Mar 2011 17:23:07 +0000
Subject: [PATCH] Remove profile methods; add forcedFastPolls to startPoller
 call

---
 motorApp/NewportSrc/XPSMotorDriver.cpp | 14 +++-----------
 motorApp/NewportSrc/XPSMotorDriver.h   |  2 --
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/motorApp/NewportSrc/XPSMotorDriver.cpp b/motorApp/NewportSrc/XPSMotorDriver.cpp
index d271a410..dabc35a6 100644
--- a/motorApp/NewportSrc/XPSMotorDriver.cpp
+++ b/motorApp/NewportSrc/XPSMotorDriver.cpp
@@ -163,9 +163,8 @@ XPSController::XPSController(const char *portName, const char *IPAddress, int IP
   FirmwareVersionGet(pollSocket_, firmwareVersion_);
   
   /* Create the poller thread for this controller
-   * NOTE: at this point the axis objects don't yet exist, so the poller needs
-   * to tolerate this */
-  startPoller(movingPollPeriod, idlePollPeriod);
+   * NOTE: at this point the axis objects don't yet exist, but the poller tolerates this */
+  startPoller(movingPollPeriod, idlePollPeriod, 10);
 }
 
 void XPSController::report(FILE *fp, int level)
@@ -483,15 +482,8 @@ XPSAxis* XPSController::getAxis(int axisNo)
   return static_cast<XPSAxis*>(asynMotorController::getAxis(axisNo));
 }
 
-asynStatus XPSController::profileMove(asynUser *pasynUser, int npoints, double positions[], double times[], int relative, int trigger)
-{
-  return asynError;
-}
 
-asynStatus XPSController::triggerProfile(asynUser *pasynUser)
-{
-  return asynError;
-}
+// These are the XPSAxis:: methods
 
 XPSAxis::XPSAxis(XPSController *pC, int axisNo, const char *positionerName, double stepSize)
   :   asynMotorAxis(pC, axisNo),
diff --git a/motorApp/NewportSrc/XPSMotorDriver.h b/motorApp/NewportSrc/XPSMotorDriver.h
index fc14a1c1..34c66a61 100644
--- a/motorApp/NewportSrc/XPSMotorDriver.h
+++ b/motorApp/NewportSrc/XPSMotorDriver.h
@@ -92,8 +92,6 @@ public:
   void report(FILE *fp, int level);
   XPSAxis* getAxis(asynUser *pasynUser);
   XPSAxis* getAxis(int axisNo);
-  asynStatus profileMove(asynUser *pasynUser, int npoints, double positions[], double times[], int relative, int trigger);
-  asynStatus triggerProfile(asynUser *pasynUser);
 
   /* These are the methods that are new to this class */
   /* Deferred moves functions.*/