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

Updated turboPmac to 1.1.1

Browse Source
This commit is contained in:
mathis_s
2025-06-10 15:00:33 +02:00
parent 6f9b890374
commit c15e513b2e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/detectorTowerController.cpp
View File

@ -110,7 +110,7 @@ asynStatus detectorTowerController::readInt32(asynUser *pasynUser,
epicsInt32 *value) { epicsInt32 *value) {
// The detector axes cannot be disabled // The detector axes cannot be disabled
if (pasynUser->reason == motorCanDisable_) { if (pasynUser->reason == motorCanDisable()) {
detectorTowerAngleAxis *aAxis = getDetectorTowerAngleAxis(pasynUser); detectorTowerAngleAxis *aAxis = getDetectorTowerAngleAxis(pasynUser);
if (aAxis != nullptr) { if (aAxis != nullptr) {
*value = 0; *value = 0;

4
src/detectorTowerLiftAxis.cpp
View File

@ -154,7 +154,7 @@ asynStatus detectorTowerLiftAxis::poll(bool *moving) {
__LINE__); __LINE__);
} }
} }
wasMoving_ = *moving; setWasMoving(*moving);
return status; return status;
} }
@ -183,7 +183,7 @@ asynStatus detectorTowerLiftAxis::doMove(double position, int relative,
// Signal to the deferredMovementCollectorLoop (of the // Signal to the deferredMovementCollectorLoop (of the
// detectorTowerAngleAxis) that a movement should be started to the // detectorTowerAngleAxis) that a movement should be started to the
// defined target position. // defined target position.
targetPosition_ = position * motorRecResolution; setTargetPosition(position * motorRecResolution);
angleAxis_->receivedTarget_ = true; angleAxis_->receivedTarget_ = true;
return asynSuccess; return asynSuccess;