From c15e513b2e57747b00d0d60ec6c456c4872b7270 Mon Sep 17 00:00:00 2001 From: smathis Date: Tue, 10 Jun 2025 15:00:33 +0200 Subject: [PATCH] Updated turboPmac to 1.1.1 --- src/detectorTowerController.cpp | 2 +- src/detectorTowerLiftAxis.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/detectorTowerController.cpp b/src/detectorTowerController.cpp index 82675d0..3d6fbb1 100644 --- a/src/detectorTowerController.cpp +++ b/src/detectorTowerController.cpp @@ -110,7 +110,7 @@ asynStatus detectorTowerController::readInt32(asynUser *pasynUser, epicsInt32 *value) { // The detector axes cannot be disabled - if (pasynUser->reason == motorCanDisable_) { + if (pasynUser->reason == motorCanDisable()) { detectorTowerAngleAxis *aAxis = getDetectorTowerAngleAxis(pasynUser); if (aAxis != nullptr) { *value = 0; diff --git a/src/detectorTowerLiftAxis.cpp b/src/detectorTowerLiftAxis.cpp index 9e7e1c0..c77b933 100644 --- a/src/detectorTowerLiftAxis.cpp +++ b/src/detectorTowerLiftAxis.cpp @@ -154,7 +154,7 @@ asynStatus detectorTowerLiftAxis::poll(bool *moving) { __LINE__); } } - wasMoving_ = *moving; + setWasMoving(*moving); return status; } @@ -183,7 +183,7 @@ asynStatus detectorTowerLiftAxis::doMove(double position, int relative, // Signal to the deferredMovementCollectorLoop (of the // detectorTowerAngleAxis) that a movement should be started to the // defined target position. - targetPosition_ = position * motorRecResolution; + setTargetPosition(position * motorRecResolution); angleAxis_->receivedTarget_ = true; return asynSuccess;