Compare commits
2 Commits
C804_drive
...
2024-v2
Author | SHA1 | Date | |
---|---|---|---|
d88e5877a7 | |||
118e177e04 |
@ -909,7 +909,7 @@ pmacV3Axis::pmacV3Axis(pmacController *pController, int axisNo)
|
||||
};
|
||||
|
||||
asynStatus pmacV3Axis::poll(bool *moving) {
|
||||
int status = 0;
|
||||
asynStatus status = asynSuccess;
|
||||
static const char *functionName = "pmacV3Axis::poll";
|
||||
char message[132];
|
||||
|
||||
@ -925,8 +925,8 @@ asynStatus pmacV3Axis::poll(bool *moving) {
|
||||
}
|
||||
|
||||
callParamCallbacks();
|
||||
return status;
|
||||
|
||||
return status ? asynError : asynSuccess;
|
||||
}
|
||||
|
||||
|
||||
@ -986,9 +986,7 @@ asynStatus pmacV3Axis::getAxisStatus(bool *moving) {
|
||||
previous_position_ = position;
|
||||
previous_direction_ = direction;
|
||||
|
||||
/* are we done? */
|
||||
/* if ((axStat == 0 || axStat < 0) && starting == 0) { */
|
||||
if (axStat == 0 && starting == 0) {
|
||||
if (axStat <= 0 && starting == 0) {
|
||||
done = 1;
|
||||
} else {
|
||||
starting = 0;
|
||||
@ -1754,4 +1752,4 @@ asynStatus GirderAxis::poll(bool *moving) {
|
||||
status = status > st ? status : st;
|
||||
|
||||
return status;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user