From 0f014436ca4f1b0905f0dc72cbcd89471d3b1c65 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Thu, 7 Apr 2011 03:36:20 +0000 Subject: [PATCH] Changed poll to have bool arg --- motorApp/ACRSrc/ACRMotorDriver.cpp | 4 ++-- motorApp/ACRSrc/ACRMotorDriver.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/motorApp/ACRSrc/ACRMotorDriver.cpp b/motorApp/ACRSrc/ACRMotorDriver.cpp index 89fe83e2..fe4e9a33 100644 --- a/motorApp/ACRSrc/ACRMotorDriver.cpp +++ b/motorApp/ACRSrc/ACRMotorDriver.cpp @@ -482,7 +482,7 @@ asynStatus ACRAxis::setPosition(double position) * It calls setIntegerParam() and setDoubleParam() for each item that it polls, * and then calls callParamCallbacks() at the end. * \param[out] moving A flag that is set indicating that the axis is moving (1) or done (0). */ -asynStatus ACRAxis::poll(int *moving) +asynStatus ACRAxis::poll(bool *moving) { int done; int driveOn; @@ -510,7 +510,7 @@ asynStatus ACRAxis::poll(int *moving) currentFlags_ = atoi(pC_->inString_); done = (currentFlags_ & 0x1000000)?0:1; setIntegerParam(pC_->motorStatusDone_, done); - *moving = done ? 0:1; + *moving = done ? false:true; // Read the current limit status sprintf(pC_->outString_, "?P%d", limitsReg_); diff --git a/motorApp/ACRSrc/ACRMotorDriver.h b/motorApp/ACRSrc/ACRMotorDriver.h index 3b8815d4..e8d3d5d5 100644 --- a/motorApp/ACRSrc/ACRMotorDriver.h +++ b/motorApp/ACRSrc/ACRMotorDriver.h @@ -28,7 +28,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); private: