lin-epics-modules/detectortower
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated turboPmac to 1.1

Browse Source
This commit is contained in:
mathis_s
2025-06-10 14:17:15 +02:00
parent 675819741b
commit fbbe8c4553
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/detectorTowerAngleAxis.cpp
View File

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