From 4f24eb7febc5b8551bd9aa4020029222b0656cc8 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Thu, 7 Apr 2011 03:36:39 +0000 Subject: [PATCH] Changed poll to have bool arg --- motorApp/MotorSimSrc/motorSimDriver.cpp | 6 +----- motorApp/MotorSimSrc/motorSimDriver.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/motorApp/MotorSimSrc/motorSimDriver.cpp b/motorApp/MotorSimSrc/motorSimDriver.cpp index 1074b91d..eb4fb49c 100644 --- a/motorApp/MotorSimSrc/motorSimDriver.cpp +++ b/motorApp/MotorSimSrc/motorSimDriver.cpp @@ -368,16 +368,12 @@ asynStatus motorSimAxis::config(int hiHardLimit, int lowHardLimit, int home, int return asynSuccess; } -asynStatus motorSimAxis::poll(int *moving) +asynStatus motorSimAxis::poll(bool *moving) { return asynSuccess; } -/**\defgroup motorSimTask Routines to implement the motor axis simulation task -@{ -*/ - /** Process one iteration of an axis This routine takes a single axis and propogates its motion forward a given amount diff --git a/motorApp/MotorSimSrc/motorSimDriver.h b/motorApp/MotorSimSrc/motorSimDriver.h index a9064d72..6504a700 100644 --- a/motorApp/MotorSimSrc/motorSimDriver.h +++ b/motorApp/MotorSimSrc/motorSimDriver.h @@ -29,7 +29,7 @@ public: 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); /* These are the methods that are new to this class */