Bugfix: A disabled PMac is no longer consider moving
This commit is contained in:
@ -925,8 +925,8 @@ asynStatus pmacV3Axis::poll(bool *moving) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
callParamCallbacks();
|
callParamCallbacks();
|
||||||
|
return status;
|
||||||
|
|
||||||
return status ? asynError : asynSuccess;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -986,9 +986,7 @@ asynStatus pmacV3Axis::getAxisStatus(bool *moving) {
|
|||||||
previous_position_ = position;
|
previous_position_ = position;
|
||||||
previous_direction_ = direction;
|
previous_direction_ = direction;
|
||||||
|
|
||||||
/* are we done? */
|
if (axStat <= 0 && starting == 0) {
|
||||||
/* if ((axStat == 0 || axStat < 0) && starting == 0) { */
|
|
||||||
if (axStat == 0 && starting == 0) {
|
|
||||||
done = 1;
|
done = 1;
|
||||||
} else {
|
} else {
|
||||||
starting = 0;
|
starting = 0;
|
||||||
@ -1754,4 +1752,4 @@ asynStatus GirderAxis::poll(bool *moving) {
|
|||||||
status = status > st ? status : st;
|
status = status > st ? status : st;
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user