From 832884179c6cc2c1beffd4fc511353ac15538e53 Mon Sep 17 00:00:00 2001 From: smathis Date: Fri, 16 May 2025 16:17:08 +0200 Subject: [PATCH] Updated dependencies sinqMotor and turboPmac both to 0.15.2 --- src/detectorTowerController.cpp | 30 +++++++++++++++--------------- turboPmac | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/detectorTowerController.cpp b/src/detectorTowerController.cpp index 3909e11..7130023 100644 --- a/src/detectorTowerController.cpp +++ b/src/detectorTowerController.cpp @@ -159,21 +159,21 @@ asynStatus detectorTowerController::writeInt32(asynUser *pasynUser, behaviour cannot be overwritten even by providing custom `reset` methods for all three axes. */ - if (pasynUser->reason == motorReset_) { - detectorTowerAngleAxis *aAxis = getDetectorTowerAngleAxis(pasynUser); - if (aAxis != nullptr) { - return aAxis->reset(); - } - detectorTowerLiftAxis *lAxis = getDetectorTowerLiftAxis(pasynUser); - if (lAxis != nullptr) { - return lAxis->reset(); - } - detectorTowerSupportAxis *sAxis = - getDetectorTowerSupportAxis(pasynUser); - if (sAxis != nullptr) { - return sAxis->reset(); - } - } + // if (pasynUser->reason == motorReset_) { + // detectorTowerAngleAxis *aAxis = getDetectorTowerAngleAxis(pasynUser); + // if (aAxis != nullptr) { + // return aAxis->reset(); + // } + // detectorTowerLiftAxis *lAxis = getDetectorTowerLiftAxis(pasynUser); + // if (lAxis != nullptr) { + // return lAxis->reset(); + // } + // detectorTowerSupportAxis *sAxis = + // getDetectorTowerSupportAxis(pasynUser); + // if (sAxis != nullptr) { + // return sAxis->reset(); + // } + // } return turboPmacController::writeInt32(pasynUser, value); } diff --git a/turboPmac b/turboPmac index 55b523d..a11d10c 160000 --- a/turboPmac +++ b/turboPmac @@ -1 +1 @@ -Subproject commit 55b523ddaa2d696f28a35c391ea96d07d82a8d5a +Subproject commit a11d10cb6ca6770a9168c0a0ef6ef1e7f6436cdc