Updated turboPmac to 1.1
This commit is contained in:
@ -189,7 +189,7 @@ asynStatus detectorTowerAngleAxis::poll(bool *moving) {
|
||||
__LINE__);
|
||||
}
|
||||
}
|
||||
wasMoving_ = *moving;
|
||||
setWasMoving(*moving);
|
||||
return status;
|
||||
}
|
||||
|
||||
@ -216,7 +216,7 @@ asynStatus detectorTowerAngleAxis::doMove(double position, int relative,
|
||||
|
||||
// Signal to the deferredMovementCollectorLoop that a movement should be
|
||||
// started to the defined target position.
|
||||
targetPosition_ = position * motorRecResolution;
|
||||
setTargetPosition(position * motorRecResolution);
|
||||
receivedTarget_ = true;
|
||||
|
||||
return asynSuccess;
|
||||
@ -282,7 +282,7 @@ asynStatus detectorTowerAngleAxis::startCombinedMove() {
|
||||
// Set the target positions for beam tilt, detector tilt offset and lift
|
||||
// offset
|
||||
snprintf(command, sizeof(command), "Q451=%lf Q454=%lf P350=1",
|
||||
targetPosition_, liftAxis_->targetPosition_);
|
||||
targetPosition(), liftAxis_->targetPosition());
|
||||
|
||||
// Lock the access to the controller since this function runs in another
|
||||
// thread than the poll method.
|
||||
|
Reference in New Issue
Block a user