lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Changed poll to have bool arg

Browse Source
This commit is contained in:
MarkRivers
2011-04-07 03:36:20 +00:00
parent 9cc57ec1c7
commit 0f014436ca
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/ACRSrc/ACRMotorDriver.cpp
+2 -2
View File
@@ -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_);
motorApp/ACRSrc/ACRMotorDriver.h
+1 -1
View File
@@ -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: